pretty autocomplete box and some py3 changes

thomasballinger · thomasballinger · commit e6c7573837cf · 2013-10-04T16:09:05.000-04:00
--HG--
branch : scroll-frontend
diff --git a/bpython/scrollfrontend/replpainter.py b/bpython/scrollfrontend/replpainter.py
@@ -39,7 +39,7 @@ def matches_lines(rows, columns, matches, current, config):
         return []
     color = func_for_letter(config.color_scheme['main'])
     max_match_width = max(len(m) for m in matches)
-    words_wide = max(1, (columns - 1) / (max_match_width + 1))
+    words_wide = max(1, (columns - 1) // (max_match_width + 1))
     matches_lines = [fmtstr(' ').join(color(m.ljust(max_match_width))
                                         if m != current
                                         else highlight_color(m) + ' '*(max_match_width - len(m))
@@ -67,10 +67,10 @@ def paint_infobox(rows, columns, matches, argspec, match, docstring, config):
     # add borders
     width = min(columns - 2, max([len(line) for line in lines]))
     output_lines = []
-    output_lines.append('+'+'-'*width+'+')
+    output_lines.append(u'┌'+u'─'*width+u'┐')
     for line in lines:
-        output_lines.append('|'+((line+' '*(width - len(line)))[:width])+'|')
-    output_lines.append('+'+'-'*width+'+')
+        output_lines.append(u'│'+((line+' '*(width - len(line)))[:width])+u'│')
+    output_lines.append(u'└'+u'─'*width+u'┘')
     r = fsarray(output_lines[:rows])
     assert len(r.shape) == 2
     #return r
diff --git a/bpython/scrollfrontend/sitefix.py b/bpython/scrollfrontend/sitefix.py
@@ -1,6 +1,8 @@
 """"""
 import sys
 
+from bpython._py3compat import py3
+
 def resetquit(builtins):
     """Redefine builtins 'quit' and 'exit' not so close stdin
 
@@ -12,4 +14,4 @@ def __call__(self, code=None):
 
 def monkeypatch_quit():
     if 'site' in sys.modules:
-        resetquit(sys.modules['__builtin__'])
+        resetquit(sys.modules['builtins' if py3 else '__builtin__'])
