pkgs/development/python-modules/eventlet/remove-distutils-usage.patch

   1 diff --git a/eventlet/hubs/hub.py b/eventlet/hubs/hub.py
   2 index db55958..c27b81f 100644
   3 --- a/eventlet/hubs/hub.py
   4 +++ b/eventlet/hubs/hub.py
   5 @@ -21,7 +21,7 @@ else:
   6
   7  import eventlet.hubs
   8  from eventlet.hubs import timer
   9 -from eventlet.support import greenlets as greenlet, clear_sys_exc_info
  10 +from eventlet.support import greenlets as greenlet
  11  try:
  12      from monotonic import monotonic
  13  except ImportError:
  14 @@ -309,7 +309,6 @@ class BaseHub(object):
  15                  cur.parent = self.greenlet
  16          except ValueError:
  17              pass  # gets raised if there is a greenlet parent cycle
  18 -        clear_sys_exc_info()
  19          return self.greenlet.switch()
  20
  21      def squelch_exception(self, fileno, exc_info):
  22 @@ -397,13 +396,11 @@ class BaseHub(object):
  23          if self.debug_exceptions:
  24              traceback.print_exception(*exc_info)
  25              sys.stderr.flush()
  26 -            clear_sys_exc_info()
  27
  28      def squelch_timer_exception(self, timer, exc_info):
  29          if self.debug_exceptions:
  30              traceback.print_exception(*exc_info)
  31              sys.stderr.flush()
  32 -            clear_sys_exc_info()
  33
  34      def add_timer(self, timer):
  35          scheduled_time = self.clock() + timer.seconds
  36 @@ -478,7 +475,6 @@ class BaseHub(object):
  37                  raise
  38              except:
  39                  self.squelch_timer_exception(timer, sys.exc_info())
  40 -                clear_sys_exc_info()
  41
  42      # for debugging:
  43
  44 diff --git a/eventlet/hubs/kqueue.py b/eventlet/hubs/kqueue.py
  45 index bad4a87..8438805 100644
  46 --- a/eventlet/hubs/kqueue.py
  47 +++ b/eventlet/hubs/kqueue.py
  48 @@ -109,4 +109,3 @@ class Hub(hub.BaseHub):
  49                  raise
  50              except:
  51                  self.squelch_exception(fileno, sys.exc_info())
  52 -                support.clear_sys_exc_info()
  53 diff --git a/eventlet/hubs/poll.py b/eventlet/hubs/poll.py
  54 index 1bbd401..d3f9c6a 100644
  55 --- a/eventlet/hubs/poll.py
  56 +++ b/eventlet/hubs/poll.py
  57 @@ -113,7 +113,6 @@ class Hub(hub.BaseHub):
  58                  raise
  59              except:
  60                  self.squelch_exception(fileno, sys.exc_info())
  61 -                support.clear_sys_exc_info()
  62
  63          if self.debug_blocking:
  64              self.block_detect_post()
  65 diff --git a/eventlet/hubs/selects.py b/eventlet/hubs/selects.py
  66 index 0ead5b8..0386a1e 100644
  67 --- a/eventlet/hubs/selects.py
  68 +++ b/eventlet/hubs/selects.py
  69 @@ -61,4 +61,3 @@ class Hub(hub.BaseHub):
  70                      raise
  71                  except:
  72                      self.squelch_exception(fileno, sys.exc_info())
  73 -                    support.clear_sys_exc_info()
  74 diff --git a/eventlet/support/__init__.py b/eventlet/support/__init__.py
  75 index 43bac91..b1c1607 100644
  76 --- a/eventlet/support/__init__.py
  77 +++ b/eventlet/support/__init__.py
  78 @@ -30,15 +30,6 @@ def get_errno(exc):
  79          return None
  80
  81
  82 -if sys.version_info[0] < 3 and not greenlets.preserves_excinfo:
  83 -    from sys import exc_clear as clear_sys_exc_info
  84 -else:
  85 -    def clear_sys_exc_info():
  86 -        """No-op In py3k.
  87 -        Exception information is not visible outside of except statements.
  88 -        sys.exc_clear became obsolete and removed."""
  89 -        pass
  90 -
  91  if sys.version_info[0] < 3:
  92      def bytes_to_str(b, encoding='ascii'):
  93          return b
  94 diff --git a/eventlet/support/greenlets.py b/eventlet/support/greenlets.py
  95 index d4e1793..b939328 100644
  96 --- a/eventlet/support/greenlets.py
  97 +++ b/eventlet/support/greenlets.py
  98 @@ -1,8 +1,4 @@
  99 -import distutils.version
 100 -
 101  import greenlet
 102  getcurrent = greenlet.greenlet.getcurrent
 103  GreenletExit = greenlet.greenlet.GreenletExit
 104 -preserves_excinfo = (distutils.version.LooseVersion(greenlet.__version__)
 105 -                     >= distutils.version.LooseVersion('0.3.2'))
 106  greenlet = greenlet.greenlet
 107 diff --git a/setup.py b/setup.py
 108 index a8f4684..9b927e0 100644
 109 --- a/setup.py
 110 +++ b/setup.py
 111 @@ -19,7 +19,7 @@ setuptools.setup(
 112      packages=setuptools.find_packages(exclude=['benchmarks', 'tests', 'tests.*']),
 113      install_requires=(
 114          'dnspython >= 1.15.0',
 115 -        'greenlet >= 0.3',
 116 +        'greenlet >= 1.0',
 117          'monotonic >= 1.4;python_version<"3.5"',
 118          'six >= 1.10.0',
 119      ),
 120 diff --git a/tests/hub_test.py b/tests/hub_test.py
 121 index a531b75..05c0024 100644
 122 --- a/tests/hub_test.py
 123 +++ b/tests/hub_test.py
 124 @@ -194,7 +194,6 @@ class TestExceptionInMainloop(tests.LimitedTestCase):
 125
 126  class TestExceptionInGreenthread(tests.LimitedTestCase):
 127
 128 -    @skip_unless(greenlets.preserves_excinfo)
 129      def test_exceptionpreservation(self):
 130          # events for controlling execution order
 131          gt1event = eventlet.Event()
 132 diff --git a/tests/test__refcount.py b/tests/test__refcount.py
 133 index 1090a1f..5c1c002 100644
 134 --- a/tests/test__refcount.py
 135 +++ b/tests/test__refcount.py
 136 @@ -57,7 +57,6 @@ def run_interaction(run_client):
 137
 138  def run_and_check(run_client):
 139      w = run_interaction(run_client=run_client)
 140 -    # clear_sys_exc_info()
 141      gc.collect()
 142      fd = w()
 143      print('run_and_check: weakref fd:', fd)