Merge

ikanobori · ikanobori · commit 7a18cc75ee51 · 2010-07-20T15:26:14.000+02:00
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -37,7 +37,8 @@
 import unicodedata
 import errno
 
-from locale import LC_ALL, getpreferredencoding, setlocale
+from locale import LC_ALL, setlocale
+import locale
 from types import ModuleType
 
 # These are used for syntax hilighting.
@@ -60,14 +61,15 @@
 from bpython.pager import page
 import bpython.args
 
-
 def log(x):
     f = open('/tmp/bpython.log', 'a')
     f.write('%s\n' % (x,))
 
 py3 = sys.version_info[0] == 3
 stdscr = None
 
+def getpreferredencoding():
+    return locale.getpreferredencoding() or sys.getdefaultencoding()
 
 def calculate_screen_lines(tokens, width, cursor=0):
     """Given a stream of tokens and a screen width plus an optional
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -60,7 +60,7 @@
 
 class Interpreter(code.InteractiveInterpreter):
 
-    def __init__(self, locals=None, encoding=sys.getdefaultencoding()):
+    def __init__(self, locals=None, encoding=None):
         """The syntaxerror callback can be set at any time and will be called
         on a caught syntax error. The purpose for this in bpython is so that
         the repl can be instantiated after the interpreter (which it
@@ -69,7 +69,7 @@ def __init__(self, locals=None, encoding=sys.getdefaultencoding()):
         specifically, this is so that autoindentation does not occur after a
         traceback."""
 
-        self.encoding = encoding
+        self.encoding = encoding or sys.getdefaultencoding()
         self.syntaxerror_callback = None
 # Unfortunately code.InteractiveInterpreter is a classic class, so no super()
         code.InteractiveInterpreter.__init__(self, locals)
@@ -242,7 +242,10 @@ def next(self):
         return self.matches[self.index]
 
     def previous(self):
-        self.index = (self.index - 1) % len(self.matches)
+        if self.index <= 0:
+            self.index = len(self.matches)
+        self.index -= 1
+
         return self.matches[self.index]
 
     def update(self, current_word='', matches=[]):
diff --git a/bpython/test/test_repl.py b/bpython/test/test_repl.py
@@ -1,4 +1,6 @@
 import unittest
+from itertools import islice
+
 from bpython import repl
 
 
@@ -52,7 +54,80 @@ def test_forward(self):
             self.history.forward()
         self.assertEqual(self.history.forward(), '#999')
 
+    def test_append(self):
+        self.history.append('print "foo\n"\n')
+        self.history.append('\n')
+
+        self.assertEqual(self.history.back(), 'print "foo\n"')
+
+    def test_enter(self):
+        self.history.enter('#lastnumber!')
+
+        self.assertEqual(self.history.back(), '#999')
+        self.assertEqual(self.history.forward(), '#lastnumber!')
+
+    def test_reset(self):
+        self.history.enter('#lastnumber!')
+        self.history.reset()
+
+        self.assertEqual(self.history.back(), '#999')
+        self.assertEqual(self.history.forward(), '')
+
+
+class TestMatchesIterator(unittest.TestCase):
+
+    def setUp(self):
+        self.matches = ['bobby', 'bobbies', 'bobberina']
+        self.matches_iterator = repl.MatchesIterator(current_word='bob',
+                                                     matches=self.matches)
+
+    def test_next(self):
+        self.assertEqual(self.matches_iterator.next(), self.matches[0])
+
+        for x in range(len(self.matches) - 1):
+            self.matches_iterator.next()
+
+        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])
+
+    def test_previous(self):
+        self.assertEqual(self.matches_iterator.previous(), self.matches[2])
+
+        for x in range(len(self.matches) - 1):
+            self.matches_iterator.previous()
+
+        self.assertNotEqual(self.matches_iterator.previous(), self.matches[0])
+        self.assertEqual(self.matches_iterator.previous(), self.matches[1])
+        self.assertEqual(self.matches_iterator.previous(), self.matches[0])
+
+    def test_nonzero(self):
+        """self.matches_iterator should be False at start,
+        then True once we active a match.
+        """
+        self.assertFalse(self.matches_iterator)
+        self.matches_iterator.next()
+        self.assertTrue(self.matches_iterator)
+
+    def test_iter(self):
+        slice = islice(self.matches_iterator, 0, 9)
+        self.assertEqual(list(slice), self.matches * 3)
+
+    def test_current(self):
+        self.assertRaises(ValueError, self.matches_iterator.current)
+        self.matches_iterator.next()
+        self.assertEqual(self.matches_iterator.current(), self.matches[0])
+
+    def test_update(self):
+        slice = islice(self.matches_iterator, 0, 3)
+        self.assertEqual(list(slice), self.matches)
+
+        newmatches = ['string', 'str', 'set']
+        self.matches_iterator.update('s', newmatches)
 
+        newslice = islice(newmatches, 0, 3)
+        self.assertNotEqual(list(slice), self.matches)
+        self.assertEqual(list(newslice), newmatches)
 
 
 if __name__ == '__main__':
diff --git a/bpython/urwid.py b/bpython/urwid.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+
 #
 # The MIT License
 #
@@ -392,7 +392,7 @@ def __init__(self, config, statusbar=None):
     def confirm(self, q):
         """Ask for yes or no and return boolean"""
         return self.statusbar.prompt(q).lower().startswith('y')
- 
+
     def notify(self, s, n=10):
         return self.statusbar.message(s, n)
 
@@ -598,7 +598,7 @@ def getstdout(self):
     def ask_confirmation(self, q):
         """Ask for yes or no and return boolean"""
         return self.statusbar.prompt(q).lower().startswith('y')
- 
+
     def reevaluate(self):
         """Clear the buffer, redraw the screen and re-evaluate the history"""
 
