# HG changeset patch # User catherine.devlin@gmail.com # Date 1311218589 14400 # Node ID 6773286315f02f6f2b6f7c84d32848ef283b91dd # Parent fe75803a4a5e15769f4d430d58fb4bcb5e433140 require pyparsing 1.5.6 for its Python 3 power diff -r fe75803a4a5e -r 6773286315f0 cmd2.py --- 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' diff -r fe75803a4a5e -r 6773286315f0 setup.py --- 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",