changeset 424:6773286315f0

require pyparsing 1.5.6 for its Python 3 power
author catherine.devlin@gmail.com
date Wed, 20 Jul 2011 23:23:09 -0400
parents fe75803a4a5e
children 1c66290a4119
files cmd2.py setup.py
diffstat 2 files changed, 2 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/cmd2.py	Wed Jul 20 23:21:29 2011 -0400
+++ b/cmd2.py	Wed Jul 20 23:23:09 2011 -0400
@@ -40,12 +40,7 @@
 import copy
 from code import InteractiveConsole, InteractiveInterpreter
 from optparse import make_option
-
-if sys.version_info[0] > 2:
-    import pyparsing_py3 as pyparsing
-    raw_input = input
-else:
-    import pyparsing
+import pyparsing
 
 __version__ = '0.6.3'
 
--- a/setup.py	Wed Jul 20 23:21:29 2011 -0400
+++ b/setup.py	Wed Jul 20 23:23:09 2011 -0400
@@ -7,7 +7,7 @@
         return ['sqlpython']
 import sys
 
-install_requires = ['pyparsing>=1.5.5']
+install_requires = ['pyparsing>=1.5.6']
 setup(
     name="cmd2",
     version="0.6.3",