Use py3 for version checks

sebastinas · sebastinas · commit f3cf6a672839 · 2020-10-11T15:25:41.000+02:00
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -64,7 +64,7 @@
 # These are used for syntax highlighting
 from pygments import format
 from pygments.formatters import TerminalFormatter
-from ._py3compat import PythonLexer
+from ._py3compat import PythonLexer, py3
 from pygments.token import Token
 from .formatter import BPythonFormatter
 
@@ -83,7 +83,6 @@
 
 from . import repl
 from . import args as bpargs
-from ._py3compat import py3
 from .pager import page
 from .args import parse as argsparse
 
@@ -1998,7 +1997,7 @@ def main_curses(scr, args, config, interactive=True, locals_=None, banner=None):
     )
     clirepl.write("\n")
 
-    if sys.version_info[0] == 2:
+    if not py3:
         # XXX these deprecation warnings need to go at some point
         clirepl.write(
             _(
diff --git a/bpython/curtsies.py b/bpython/curtsies.py
@@ -23,6 +23,7 @@
 from .curtsiesfrontend import events as bpythonevents
 from . import inspection
 from .repl import extract_exit_value
+from ._py3compat import py3
 
 logger = logging.getLogger(__name__)
 
@@ -202,7 +203,7 @@ def main(args=None, locals_=None, banner=None, welcome_message=None):
     if banner is not None:
         print(banner)
 
-    if sys.version_info[0] == 2:
+    if not py3:
         # XXX these deprecation warnings need to go at some point
         print(
             _(
diff --git a/bpython/urwid.py b/bpython/urwid.py
@@ -1394,7 +1394,7 @@ def start(main_loop, user_data):
         )
         myrepl.write("\n")
 
-        if sys.version_info[0] == 2:
+        if not py3:
             # XXX these deprecation warnings need to go at some point
             myrepl.write(
                 _(

Original file line number	Diff line number	Diff line change
`@@ -1394,7 +1394,7 @@ def start(main_loop, user_data):`
`1394`	`1394`	`)`
`1395`	`1395`	`myrepl.write("\n")`
`1396`	`1396`
`1397`		`- if sys.version_info[0] == 2:`
	`1397`	`+ if not py3:`
`1398`	`1398`	`# XXX these deprecation warnings need to go at some point`
`1399`	`1399`	`myrepl.write(`
`1400`	`1400`	`_(`