Introduced bpython._py3compat: Defines some useful attributes.

Trundle · Trundle · commit dff9dd7fc9f2 · 2012-09-30T00:13:02.000+02:00
diff --git a/bpython/_py3compat.py b/bpython/_py3compat.py
@@ -0,0 +1,44 @@
+# encoding: utf-8
+
+# The MIT License
+#
+# Copyright (c) 2012 the 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
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#
+
+
+"""
+    Helper module for Python 3 compatibility.
+
+    Defines the following attributes:
+
+    - PythonLexer: Pygment's Python lexer matching the hosting runtime's
+      Python version.
+    - py3: True if the hosting Python runtime is of Python version 3 or later
+"""
+
+import sys
+
+py3 = (sys.version_info[0] == 3)
+
+if py3:
+    from pygments.lexers import Python3Lexer as PythonLexer
+else:
+    from pygments.lexers import PythonLexer
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -81,11 +81,11 @@
 from bpython.translations import _
 
 from bpython import repl
+from bpython._py3compat import py3
 from bpython.pager import page
 from bpython import autocomplete
 import bpython.args
 
-py3 = sys.version_info[0] == 3
 if not py3:
     import inspect
 
diff --git a/bpython/gtk_.py b/bpython/gtk_.py
@@ -37,16 +37,14 @@
 import gobject
 import gtk
 import pango
-from pygments.lexers import PythonLexer
 
 from bpython import importcompletion, repl, translations
+from bpython._py3compat import PythonLexer, py3
 from bpython.formatter import theme_map
 from bpython.translations import _
 import bpython.args
 
 
-py3 = sys.version_info[0] == 3
-
 _COLORS = dict(b='blue', c='cyan', g='green', m='magenta', r='red',
                w='white', y='yellow', k='black', d='black')
 
diff --git a/bpython/importcompletion.py b/bpython/importcompletion.py
@@ -41,7 +41,7 @@ def catch_warnings():
         finally:
             warnings.filters = filters
 
-py3 = sys.version_info[:2] >= (3, 0)
+from bpython._py3compat import py3
 
 # The cached list of all known modules
 modules = set()
diff --git a/bpython/inspection.py b/bpython/inspection.py
@@ -29,10 +29,12 @@
 import re
 import sys
 import types
+from itertools import dropwhile
 
-from pygments.lexers import PythonLexer
 from pygments.token import Token
 
+from bpython._py3compat import PythonLexer, py3
+
 try:
     collections.Callable
     has_collections_callable = True
@@ -44,8 +46,6 @@
 except AttributeError:
     has_instance_type = False
 
-py3 = sys.version_info[0] == 3
-
 if not py3:
     _name = re.compile(r'[a-zA-Z_]\w*$')
 
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -42,15 +42,10 @@
 from urlparse import urlparse
 from xmlrpclib import ServerProxy, Error as XMLRPCError
 
-py3 = sys.version_info[0] == 3
-
 from pygments.token import Token
-if py3:
-    from pygments.lexers import Python3Lexer as PythonLexer
-else:
-    from pygments.lexers import PythonLexer
 
 from bpython import importcompletion, inspection
+from bpython._py3compat import PythonLexer, py3
 from bpython.formatter import Parenthesis
 from bpython.translations import _
 from bpython.autocomplete import Autocomplete
diff --git a/bpython/urwid.py b/bpython/urwid.py
@@ -46,6 +46,7 @@
 from pygments.token import Token
 
 from bpython import args as bpargs, repl, translations
+from bpython._py3compat import py3
 from bpython.formatter import theme_map
 from bpython.importcompletion import find_coroutine
 from bpython.translations import _
@@ -54,7 +55,6 @@
 
 import urwid
 
-py3 = sys.version_info[0] == 3
 if not py3:
     import inspect
 
