dependency name change fmtstr -> curtsies

thomasballinger · thomasballinger · commit c9eeeb2bab87 · 2013-12-17T13:23:34.000-05:00
--HG--
branch : scroll-frontend
rename : bpython/scroll.py =&gt; bpython/curtsies.py
rename : bpython/scrollfrontend/__init__.py =&gt; bpython/curtsiesfrontend/__init__.py
rename : bpython/scrollfrontend/coderunner.py =&gt; bpython/curtsiesfrontend/coderunner.py
rename : bpython/scrollfrontend/friendly.py =&gt; bpython/curtsiesfrontend/friendly.py
rename : bpython/scrollfrontend/interaction.py =&gt; bpython/curtsiesfrontend/interaction.py
rename : bpython/scrollfrontend/manual_readline.py =&gt; bpython/curtsiesfrontend/manual_readline.py
rename : bpython/scrollfrontend/repl.py =&gt; bpython/curtsiesfrontend/repl.py
rename : bpython/scrollfrontend/replpainter.py =&gt; bpython/curtsiesfrontend/replpainter.py
rename : bpython/scrollfrontend/sitefix.py =&gt; bpython/curtsiesfrontend/sitefix.py
rename : data/bpython-scroll =&gt; data/bpython-curtsies
diff --git a/bpython/curtsies.py b/bpython/curtsies.py
@@ -1,11 +1,16 @@
+from __future__ import absolute_import
+
 import sys
 from optparse import Option
 
-from fmtstr.terminal import Terminal
-from fmtstr.terminalcontrol import TerminalController
+import curtsies
+import curtsies.window
+import curtsies.terminal
+Window = curtsies.window.Window
+Terminal = curtsies.terminal.Terminal
 
-from bpython.scrollfrontend.repl import Repl
-from bpython.scrollfrontend.coderunner import SystemExitFromCodeThread
+from bpython.curtsiesfrontend.repl import Repl
+from bpython.curtsiesfrontend.coderunner import SystemExitFromCodeThread
 from bpython import args as bpargs
 from bpython.translations import _
 
@@ -19,8 +24,10 @@ def main(args=None, locals_=None, banner=None):
         import logging
         logging.basicConfig(filename='scroll.log', level=logging.DEBUG)
 
-    with TerminalController() as tc:
-        with Terminal(tc, keep_last_line=True, hide_cursor=False) as term:
+    # do parsing before doing any frontend stuff
+    with Terminal() as tc:
+        with Window(tc, keep_last_line=True, hide_cursor=False) as term:
+            #TODO why need to make repl first
             with Repl(config=config,
                       locals_=locals_,
                       stuff_a_refresh_request=tc.stuff_a_refresh_request,
@@ -33,6 +40,7 @@ def main(args=None, locals_=None, banner=None):
                 if exec_args:
                     assert options, "don't pass in exec_args without options"
                     try:
+                        # THIS IS NORMAL PYTHON
                         #TODO replace this so that stdout is properly harvested for display!
                         bpargs.exec_code(repl.interp, exec_args)
                     except SystemExit, e:
@@ -49,6 +57,7 @@ def main(args=None, locals_=None, banner=None):
                     try:
                         repl.process_event(tc.get_event())
                     except SystemExitFromCodeThread:
+                        #Get rid of nasty constant
                         array, cursor_pos = repl.paint(about_to_exit=2)
                         term.render_to_terminal(array, cursor_pos)
                         raise
@@ -60,6 +69,7 @@ def main(args=None, locals_=None, banner=None):
                         array, cursor_pos = repl.paint()
                         scrolled = term.render_to_terminal(array, cursor_pos)
                         repl.scroll_offset += scrolled
+                        # Could calculate this in repl?
 
 if __name__ == '__main__':
     sys.exit(main())
diff --git a/bpython/curtsiesfrontend/__init__.py b/bpython/curtsiesfrontend/__init__.py
diff --git a/bpython/curtsiesfrontend/coderunner.py b/bpython/curtsiesfrontend/coderunner.py
@@ -74,7 +74,7 @@ def run_code(self, for_code=None):
             signal.signal(signal.SIGINT, self.orig_sigint_handler)
             self.orig_sigint_handler = None
             return request
-        elif request in ['SystemExit']:
+        elif request in ['SystemExit']: #use the object?
             self._unload_code()
             raise SystemExitFromCodeThread()
         else:
diff --git a/bpython/curtsiesfrontend/friendly.py b/bpython/curtsiesfrontend/friendly.py
diff --git a/bpython/curtsiesfrontend/interaction.py b/bpython/curtsiesfrontend/interaction.py
@@ -3,7 +3,7 @@
 
 from bpython.repl import Interaction as BpythonInteraction
 
-from bpython.scrollfrontend.manual_readline import char_sequences as rl_char_sequences
+from bpython.curtsiesfrontend.manual_readline import char_sequences as rl_char_sequences
 
 class StatusBar(BpythonInteraction):
     """StatusBar and Interaction for Repl
diff --git a/bpython/curtsiesfrontend/manual_readline.py b/bpython/curtsiesfrontend/manual_readline.py
@@ -4,7 +4,7 @@
 and the cursor location
 in the order of description at http://www.bigsmoke.us/readline/shortcuts"""
 
-from bpython.scrollfrontend.friendly import NotImplementedError
+from bpython.curtsiesfrontend.friendly import NotImplementedError
 import re
 char_sequences = {}
 
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -18,19 +18,19 @@
 from bpython.translations import _
 from bpython._py3compat import py3
 
-from fmtstr.fsarray import FSArray
-from fmtstr.fmtstr import fmtstr, FmtStr
-from fmtstr.bpythonparse import parse as bpythonparse
-from fmtstr.bpythonparse import func_for_letter, color_for_letter
-
-from bpython.scrollfrontend.manual_readline import char_sequences as rl_char_sequences
-from bpython.scrollfrontend.manual_readline import get_updated_char_sequences
-from bpython.scrollfrontend.interaction import StatusBar
-from bpython.scrollfrontend import sitefix; sitefix.monkeypatch_quit()
-import bpython.scrollfrontend.replpainter as paint
-import fmtstr.events as events
-from bpython.scrollfrontend.friendly import NotImplementedError
-from bpython.scrollfrontend.coderunner import CodeRunner, FakeOutput
+from curtsies.fsarray import FSArray
+from curtsies.fmtstr import fmtstr, FmtStr
+from curtsies.bpythonparse import parse as bpythonparse
+from curtsies.bpythonparse import func_for_letter, color_for_letter
+
+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.friendly import NotImplementedError
+from bpython.curtsiesfrontend.coderunner import CodeRunner, FakeOutput
 
 #TODO implement paste mode and figure out what the deal with config.paste_time is
 #TODO figure out how config.auto_display_list=False behaves and implement it
@@ -217,7 +217,7 @@ def clean_up_current_line_for_exit(self):
     def process_event(self, e):
         """Returns True if shutting down, otherwise mutates state of Repl object"""
         # event names uses here are curses compatible, or the full names
-        # for a full list of what should have pretty names, see fmtstr.events.CURSES_TABLE
+        # for a full list of what should have pretty names, see curtsies.events.CURSES_TABLE
 
         if not isinstance(e, events.Event):
             self.last_events.append(e)
diff --git a/bpython/curtsiesfrontend/replpainter.py b/bpython/curtsiesfrontend/replpainter.py
@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*- 
 import logging
 
-from fmtstr.fmtfuncs import bold
-from fmtstr.fsarray import fsarray
-from fmtstr.bpythonparse import func_for_letter
-from fmtstr.fmtstr import fmtstr, linesplit
+from curtsies.fmtfuncs import bold
+from curtsies.fsarray import fsarray
+from curtsies.bpythonparse import func_for_letter
+from curtsies.fmtstr import fmtstr, linesplit
 
 from bpython._py3compat import py3
 if not py3:
diff --git a/bpython/curtsiesfrontend/sitefix.py b/bpython/curtsiesfrontend/sitefix.py
diff --git a/data/bpython-curtsies b/data/bpython-curtsies
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
 import sys
-from bpython.scroll import main
+from bpython.curtsies import main
 
 sys.exit(main())
diff --git a/setup.py b/setup.py
@@ -153,11 +153,11 @@ def initialize_options(self):
         'pygments'
     ],
     extras_require = {
-        'scroll': ['fmtstr>=0.0.23'],
+        'curtsies': ['curtsies>=0.0.24'],
         'urwid' : ['urwid']
     },
     tests_require = ['mock'],
-    packages = ["bpython", "bpython.test", "bpython.translations", "bpdb", "bpython.scrollfrontend"],
+    packages = ["bpython", "bpython.test", "bpython.translations", "bpdb", "bpython.curtsiesfrontend"],
     data_files = data_files,
     package_data = {
         'bpython': ['logo.png'],
@@ -168,15 +168,15 @@ def initialize_options(self):
         'console_scripts': [
             'bpython = bpython.cli:main',
             'bpython-urwid = bpython.urwid:main [urwid]',
-            'bpython-scroll = bpython.scroll:main [scroll]',
+            'bpython-curtsies = bpython.curtsies:main [curtsies]',
         ],
         'gui_scripts': [
             'bpython-gtk = bpython.gtk_:main'
          ]
     },
     scripts = ([] if using_setuptools else ['data/bpython',
                                             'data/bpython-gtk',
-                                            'data/bpython-scroll',
+                                            'data/bpython-curtsies',
                                             'data/bpython-urwid']),
     cmdclass = cmdclass,
     test_suite = 'bpython.test'
