diff options
| -rw-r--r-- | paramiko/ssh_gss.py | 18 | ||||
| -rw-r--r-- | setup.py | 2 | ||||
| -rw-r--r-- | sites/www/installing.rst | 10 | ||||
| -rw-r--r-- | tox-requirements.txt | 2 |
4 files changed, 8 insertions, 24 deletions
diff --git a/paramiko/ssh_gss.py b/paramiko/ssh_gss.py index ebf2cc80..dfc9ddc8 100644 --- a/paramiko/ssh_gss.py +++ b/paramiko/ssh_gss.py @@ -39,22 +39,8 @@ import sys """ GSS_AUTH_AVAILABLE = True -try: - from pyasn1.type.univ import ObjectIdentifier - from pyasn1.codec.der import encoder, decoder -except ImportError: - GSS_AUTH_AVAILABLE = False - class ObjectIdentifier(object): - def __init__(self, *args): - raise NotImplementedError("Module pyasn1 not importable") - - class decoder(object): - def decode(self): - raise NotImplementedError("Module pyasn1 not importable") - - class encoder(object): - def encode(self): - raise NotImplementedError("Module pyasn1 not importable") +from pyasn1.type.univ import ObjectIdentifier +from pyasn1.codec.der import encoder, decoder from paramiko.common import MSG_USERAUTH_REQUEST from paramiko.ssh_exception import SSHException @@ -43,7 +43,7 @@ try: 'install_requires': [ 'cryptography >= 0.5.4', 'ecdsa >= 0.11', - 'pyasn1', + 'pyasn1 >= 0.1.7', ], } except ImportError: diff --git a/sites/www/installing.rst b/sites/www/installing.rst index d6edbd5a..dc20590e 100644 --- a/sites/www/installing.rst +++ b/sites/www/installing.rst @@ -20,10 +20,10 @@ We currently support **Python 2.6, 2.7, 3.3+, and PyPy** (Python **3.2** should also work but has a less-strong compatibility guarantee from us.) Users on Python 2.5 or older are urged to upgrade. -Paramiko has two hard dependencies: the pure-Python ECDSA module ``ecdsa``, and -the Cryptography library. ``ecdsa`` is easily installable from wherever you -obtained Paramiko's package; Cryptography may require more work. Read on for -details. +Paramiko has three hard dependencies: the pure-Python ECDSA module ``ecdsa`` +and ASN1 module ``pyasn1``, and the Cryptography library. ``ecdsa`` is easily +installable from wherever you obtained Paramiko's package; Cryptography may +require more work. Read on for details. If you need GSS-API / SSPI support, see :ref:`the below subsection on it <gssapi>` for details on additional dependencies. @@ -85,8 +85,6 @@ due to their infrequent utility & non-platform-agnostic requirements): * It hopefully goes without saying but **all platforms** need **a working installation of GSS-API itself**, e.g. Heimdal. -* **All platforms** need `pyasn1 <https://pypi.python.org/pypi/pyasn1>`_ - ``0.1.7`` or better. * **Unix** needs `python-gssapi <https://pypi.python.org/pypi/python-gssapi/>`_ ``0.6.1`` or better. diff --git a/tox-requirements.txt b/tox-requirements.txt index 3a834b7f..e66a4534 100644 --- a/tox-requirements.txt +++ b/tox-requirements.txt @@ -1,3 +1,3 @@ # Not sure why tox can't just read setup.py? cryptography >= 0.5.4 -pyasn1 +pyasn1 >= 0.1.7 |