summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xcmd2.py8
-rwxr-xr-xsetup.py2
2 files changed, 8 insertions, 2 deletions
diff --git a/cmd2.py b/cmd2.py
index 6ac1fee2..54eff811 100755
--- a/cmd2.py
+++ b/cmd2.py
@@ -52,8 +52,14 @@ except ImportError:
import pyparsing
import pyperclip
-from pyperclip import PyperclipException
+# Newer versions of pyperclip are released as a single file, but older versions had a more complicated structure
+try:
+ from pyperclip.exceptions import PyperclipException
+except ImportError:
+ # noinspection PyUnresolvedReferences
+ from pyperclip import PyperclipException
+
# Collection is a container that is sizable and iterable
# It was introduced in Python 3.6. We will try to import it, otherwise use our implementation
try:
diff --git a/setup.py b/setup.py
index c231e7ea..88e4cf7d 100755
--- a/setup.py
+++ b/setup.py
@@ -61,7 +61,7 @@ Programming Language :: Python :: Implementation :: PyPy3
Topic :: Software Development :: Libraries :: Python Modules
""".splitlines())))
-INSTALL_REQUIRES = ['pyparsing >= 2.1.0', 'pyperclip >= 1.6.0']
+INSTALL_REQUIRES = ['pyparsing >= 2.1.0', 'pyperclip >= 1.5.27']
EXTRAS_REQUIRE = {
# Windows also requires pyreadline to ensure tab completion works