Unbreak 2to3

sebastinas · sebastinas · commit b642758382b0 · 2015-02-04T18:30:39.000+01:00
Signed-off-by: Sebastian Ramacher &lt;sebastian+dev@ramacher.at&gt;
diff --git a/bpython/importcompletion.py b/bpython/importcompletion.py
@@ -30,11 +30,6 @@
 import warnings
 from warnings import catch_warnings
 
-if py3:
-    ifilter = filter
-else:
-    from itertools import ifilter
-
 if sys.version_info[0] == 3 and sys.version_info[1] >= 3:
     import importlib.machinery
     SUFFIXES = importlib.machinery.all_suffixes()
@@ -88,7 +83,7 @@ def attr_matches(cw, prefix='', only_modules=False):
         matches = ('%s.%s' % (module_part, m) for m in matches)
 
     generator = (try_decode_module(match, 'ascii') for match in matches)
-    return set(ifilter(lambda x: x is not None, generator))
+    return set(filter(lambda x: x is not None, generator))
 
 
 def module_attr_matches(name):
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -200,7 +200,7 @@ def __nonzero__(self):
         return self.index != -1
 
     def __bool__(self):
-        return self.__nonzero__()
+        return self.index != -1
 
     @property
     def candidate_selected(self):
@@ -215,12 +215,16 @@ def current(self):
             raise ValueError('No current match.')
         return self.matches[self.index]
 
-    def __next__(self):
+    def _next_impl(self):
+        """Keep this around until we drop 2to3."""
         self.index = (self.index + 1) % len(self.matches)
         return self.matches[self.index]
 
     def next(self):
-        return self.__next__()
+        return self._next_impl()
+
+    def __next__(self):
+        return self._next_impl()
 
     def previous(self):
         if self.index <= 0:
diff --git a/bpython/test/test_repl.py b/bpython/test/test_repl.py
@@ -52,14 +52,14 @@ def setUp(self):
         self.matches_iterator.matches = self.matches
 
     def test_next(self):
-        self.assertEqual(self.matches_iterator.next(), self.matches[0])
+        self.assertEqual(next(self.matches_iterator), self.matches[0])
 
         for x in range(len(self.matches) - 1):
-            self.matches_iterator.next()
+            next(self.matches_iterator)
 
-        self.assertEqual(self.matches_iterator.next(), self.matches[0])
-        self.assertEqual(self.matches_iterator.next(), self. matches[1])
-        self.assertNotEqual(self.matches_iterator.next(), self.matches[1])
+        self.assertEqual(next(self.matches_iterator), self.matches[0])
+        self.assertEqual(next(self.matches_iterator), self. matches[1])
+        self.assertNotEqual(next(self.matches_iterator), self.matches[1])
 
     def test_previous(self):
         self.assertEqual(self.matches_iterator.previous(), self.matches[2])
@@ -76,7 +76,7 @@ def test_nonzero(self):
         then True once we active a match.
         """
         self.assertFalse(self.matches_iterator)
-        self.matches_iterator.next()
+        next(self.matches_iterator)
         self.assertTrue(self.matches_iterator)
 
     def test_iter(self):
@@ -85,7 +85,7 @@ def test_iter(self):
 
     def test_current(self):
         self.assertRaises(ValueError, self.matches_iterator.current)
-        self.matches_iterator.next()
+        next(self.matches_iterator)
         self.assertEqual(self.matches_iterator.current(), self.matches[0])
 
     def test_update(self):
@@ -110,7 +110,7 @@ def test_cur_line(self):
 
         self.assertRaises(ValueError, self.matches_iterator.cur_line)
 
-        self.assertEqual(self.matches_iterator.next(), self.matches[0])
+        self.assertEqual(next(self.matches_iterator), self.matches[0])
         self.assertEqual(self.matches_iterator.cur_line(),
                          (len(self.matches[0]), self.matches[0]))
 
