summaryrefslogtreecommitdiff
path: root/paramiko/__init__.py
diff options
context:
space:
mode:
authorJeremy T. Bouse <jbouse@debian.org>2014-09-22 09:21:39 -0400
committerJeremy T. Bouse <jbouse@debian.org>2014-09-22 09:21:39 -0400
commit70f669a0a41e104bd0427e8ad9142071aae241ed (patch)
treea5c0a22c336514e1db001012a64d15477986b671 /paramiko/__init__.py
parente9306cab7448e641a54789039f5c8bfe988de320 (diff)
parentccd643cdbd7ba752727d62051058a4454451414d (diff)
downloadpython-paramiko-70f669a0a41e104bd0427e8ad9142071aae241ed.tar
python-paramiko-70f669a0a41e104bd0427e8ad9142071aae241ed.tar.gz
Merge tag 'upstream/1.15.0'
Upstream version 1.15.0
Diffstat (limited to 'paramiko/__init__.py')
-rw-r--r--paramiko/__init__.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/paramiko/__init__.py b/paramiko/__init__.py
index 2ebc8a6..9e2ba01 100644
--- a/paramiko/__init__.py
+++ b/paramiko/__init__.py
@@ -17,20 +17,20 @@
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
import sys
+from paramiko._version import __version__, __version_info__
if sys.version_info < (2, 6):
raise RuntimeError('You need Python 2.6+ for this module.')
__author__ = "Jeff Forcier <jeff@bitprophet.org>"
-__version__ = "1.14.1"
-__version_info__ = tuple([ int(d) for d in __version__.split(".") ])
__license__ = "GNU Lesser General Public License (LGPL)"
from paramiko.transport import SecurityOptions, Transport
from paramiko.client import SSHClient, MissingHostKeyPolicy, AutoAddPolicy, RejectPolicy, WarningPolicy
from paramiko.auth_handler import AuthHandler
+from paramiko.ssh_gss import GSSAuth, GSS_AUTH_AVAILABLE
from paramiko.channel import Channel, ChannelFile
from paramiko.ssh_exception import SSHException, PasswordRequiredException, \
BadAuthenticationType, ChannelException, BadHostKeyException, \