From 6beca32f8062826b76a1df6f89535fa7f455d9dd Mon Sep 17 00:00:00 2001 From: catherine devlin Date: Wed, 20 Jul 2011 23:23:09 -0400 Subject: require pyparsing 1.5.6 for its Python 3 power --- cmd2.py | 7 +------ setup.py | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/cmd2.py b/cmd2.py index aebe618..46e29d4 100755 --- a/cmd2.py +++ b/cmd2.py @@ -40,12 +40,7 @@ import platform 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 --git a/setup.py b/setup.py index c220ac5..ae1dd43 100755 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ except ImportError: return ['sqlpython'] import sys -install_requires = ['pyparsing>=1.5.5'] +install_requires = ['pyparsing>=1.5.6'] setup( name="cmd2", version="0.6.3", -- cgit v1.2.1