update to curtsies 0.1.x

thomasballinger · thomasballinger · commit a634a2920acb · 2014-07-04T22:40:56.000-04:00
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -21,18 +21,17 @@
 from bpython.translations import _
 from bpython._py3compat import py3
 
-from curtsies.fsarray import FSArray
-from curtsies.fmtstr import fmtstr, FmtStr
+from curtsies import FSArray, fmtstr, FmtStr
 from curtsies.bpythonparse import parse as bpythonparse
 from curtsies.bpythonparse import func_for_letter, color_for_letter
 from curtsies import fmtfuncs
+from curtsies import events
 
 from bpython.curtsiesfrontend.manual_readline import char_sequences as rl_char_sequences
 from bpython.curtsiesfrontend.manual_readline import get_updated_char_sequences
 from bpython.curtsiesfrontend.interaction import StatusBar
 from bpython.curtsiesfrontend import sitefix; sitefix.monkeypatch_quit()
 import bpython.curtsiesfrontend.replpainter as paint
-import curtsies.events as events
 from bpython.curtsiesfrontend.coderunner import CodeRunner, FakeOutput
 
 #TODO other autocomplete modes (also fix in other bpython implementations)
diff --git a/bpython/curtsiesfrontend/replpainter.py b/bpython/curtsiesfrontend/replpainter.py
@@ -2,10 +2,10 @@
 import logging
 import os
 
-from curtsies.fmtfuncs import bold
-from curtsies.fsarray import fsarray
+from curtsies import fsarray, fmtstr
 from curtsies.bpythonparse import func_for_letter
-from curtsies.fmtstr import fmtstr, linesplit
+from curtsies.formatstring import linesplit
+from curtsies.fmtfuncs import bold
 
 from bpython._py3compat import py3
 if not py3:
diff --git a/setup.py b/setup.py
@@ -151,7 +151,7 @@ def initialize_options(self):
 
 if sys.version_info[:2] >= (2, 6):
     # curtsies only supports 2.6 and onwards
-    extras_require['curtsies'] = ['curtsies >=0.0.32, <0.1.0', 'greenlet']
+    extras_require['curtsies'] = ['curtsies >=0.1.0, <0.2.0', 'greenlet']
     packages.append("bpython.curtsiesfrontend")
     entry_points['console_scripts'].append(
         'bpython-curtsies = bpython.curtsies:main [curtsies]')
