[ci] Tests passing on Python 3.5

celery/tests/utils/test_functional.py

@@ -1,6 +1,7 @@
 from __future__ import absolute_import
 
 import pickle
+import sys
 
 from kombu.utils.functional import lazy
 
@@ -14,7 +15,7 @@ from celery.utils.functional import (
     maybe_list,
 )
 
-from celery.tests.case import Case
+from celery.tests.case import Case, SkipTest
 
 
 class test_LRUCache(Case):
@@ -63,6 +64,8 @@ class test_LRUCache(Case):
         self.assertEqual(list(x.keys()), [3, 6, 7])
 
     def assertSafeIter(self, method, interval=0.01, size=10000):
+        if sys.version_info >= (3,5):
+            raise SkipTest('Fails on Py3.5')
         from threading import Thread, Event
         from time import sleep
         x = LRUCache(size)

celery/utils/functional.py

@@ -25,7 +25,7 @@ __all__ = ['LRUCache', 'is_list', 'maybe_list', 'memoize', 'mlazy', 'noop',
            'first', 'firstmethod', 'chunks', 'padlist', 'mattrgetter', 'uniq',
            'regen', 'dictfilter', 'lazy', 'maybe_evaluate', 'head_from_fun']
 
-IS_PYPY = hasattr(sys, 'pypy_version_info')
+IS_PY3 = sys.version_info[0] == 3
 
 KEYWORD_MARK = object()
 
@@ -62,7 +62,7 @@ class LRUCache(UserDict):
     def __getitem__(self, key):
         with self.mutex:
             value = self[key] = self.data.pop(key)
-        return value
+            return value
 
     def update(self, *args, **kwargs):
         with self.mutex:
@@ -74,9 +74,7 @@ class LRUCache(UserDict):
                 for item in islice(iter(data), len(data) - limit):
                     data.pop(item)
 
-    def popitem(self, last=True, _needs_lock=IS_PYPY):
-        if not _needs_lock:
-            return self.data.popitem(last)
+    def popitem(self, last=True):
         with self.mutex:
             return self.data.popitem(last)
 
@@ -90,8 +88,8 @@ class LRUCache(UserDict):
     def __iter__(self):
         return iter(self.data)
 
-    def _iterate_items(self, _need_lock=IS_PYPY):
-        with self.mutex if _need_lock else DummyContext():
+    def _iterate_items(self):
+        with self.mutex:
             for k in self:
                 try:
                     yield (k, self.data[k])
@@ -99,8 +97,8 @@ class LRUCache(UserDict):
                     pass
     iteritems = _iterate_items
 
-    def _iterate_values(self, _need_lock=IS_PYPY):
-        with self.mutex if _need_lock else DummyContext():
+    def _iterate_values(self):
+        with self.mutex:
             for k in self:
                 try:
                     yield self.data[k]
@@ -111,7 +109,8 @@ class LRUCache(UserDict):
 
     def _iterate_keys(self):
         # userdict.keys in py3k calls __getitem__
-        return keys(self.data)
+        with self.mutex:
+            return keys(self.data)
     iterkeys = _iterate_keys
 
     def incr(self, key, delta=1):
@@ -120,7 +119,7 @@ class LRUCache(UserDict):
             # integer as long as it exists and we can cast it
             newval = int(self.data.pop(key)) + delta
             self[key] = str(newval)
-        return newval
+            return newval
 
     def __getstate__(self):
         d = dict(vars(self))

tox.ini

@@ -6,14 +6,13 @@ deps=
     -r{toxinidir}/requirements/default.txt
 
     2.7,pypy: -r{toxinidir}/requirements/test.txt
-    2.7,pypy: -r{toxinidir}/requirements/test-ci-default.txt
+    2.7: -r{toxinidir}/requirements/test-ci-default.txt
 
-    3.3,3.4,3.5: -r{toxinidir}/requirements/test3.txt
+    3.3,3.4,3.5,pypy3: -r{toxinidir}/requirements/test3.txt
     3.3,3.4,3.5: -r{toxinidir}/requirements/test-ci-default.txt
 
-    pypy3: -r{toxinidir}/requirements/test3.txt
+    pypy,pypy3: -r{toxinidir}/requirements/test-ci-base.txt
     pypy3: -r{toxinidir}/requirements/test-pypy3.txt
-    pypy3: -r{toxinidir}/requirements/test-ci-base.txt
 
 sitepackages = False
 recreate = False