Merge in Anatoly's changes.

Trundle · Trundle · commit 313d4d179a75 · 2011-05-01T12:36:22.000+02:00
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -1,7 +1,7 @@
-
 # The MIT License
 #
 # Copyright (c) 2008 Bob Farrell
+# Copyright (c) bpython authors
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -40,7 +40,7 @@
 import locale
 from types import ModuleType
 
-# These are used for syntax hilighting.
+# These are used for syntax highlighting
 from pygments import format
 from pygments.formatters import TerminalFormatter
 from pygments.lexers import PythonLexer
@@ -68,7 +68,13 @@
 if not py3:
     import inspect
 
+
+# --- module globals ---
 stdscr = None
+colors = None
+
+DO_RESIZE = False
+# ---
 
 def getpreferredencoding():
     return locale.getpreferredencoding() or sys.getdefaultencoding()
@@ -180,8 +186,6 @@ def read(self, size=None):
     def readlines(self, size=-1):
         return list(iter(self.readline, ''))
 
-DO_RESIZE = False
-
 # TODO:
 #
 # Tab completion does not work if not at the end of the line.
@@ -197,6 +201,7 @@ def readlines(self, size=-1):
 
 
 def get_color(config, name):
+    global colors
     return colors[config.color_scheme[name].lower()]
 
 
@@ -1282,6 +1287,7 @@ def lsize():
     def size(self):
         """Set instance attributes for x and y top left corner coordinates
         and width and heigth for the window."""
+        global stdscr
         h, w = stdscr.getmaxyx()
         self.y = 0
         self.w = w
@@ -1521,7 +1527,7 @@ def clear(self):
         self.win.clear()
 
 
-def init_wins(scr, colors, config):
+def init_wins(scr, config):
     """Initialise the two windows (the main repl interface and the little
     status bar at the bottom with some stuff in it)"""
 #TODO: Document better what stuff is on the status bar.
@@ -1581,6 +1587,7 @@ def idle(caller):
     The statusbar check needs to go here to take care of timed
     messages and the resize handlers need to be here to make
     sure it happens conveniently."""
+    global DO_RESIZE
 
     if importcompletion.find_coroutine() or caller.paste_mode:
         caller.scr.nodelay(True)
@@ -1670,7 +1677,6 @@ def main_curses(scr, args, config, interactive=True, locals_=None,
     global stdscr
     global DO_RESIZE
     global colors
-    global repl
     DO_RESIZE = False
 
     old_sigwinch_handler = signal.signal(signal.SIGWINCH,
@@ -1692,7 +1698,7 @@ def main_curses(scr, args, config, interactive=True, locals_=None,
     scr.timeout(300)
 
     curses.raw(True)
-    main_win, statusbar = init_wins(scr, cols, config)
+    main_win, statusbar = init_wins(scr, config)
 
     if locals_ is None:
         sys.modules['__main__'] = ModuleType('__main__')
@@ -1734,8 +1740,6 @@ def main_curses(scr, args, config, interactive=True, locals_=None,
 
 
 def main(args=None, locals_=None, banner=None):
-    global stdscr
-
     locale.setlocale(locale.LC_ALL, "")
     translations.init()
 
