diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-09-08 15:59:05 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-09-08 15:59:05 -0700 |
| commit | 752507a2978b0c6091ee737cd37ba1cb690926a2 (patch) | |
| tree | 2610670fc4edd07ae96851c4947a3c69d360cb88 /paramiko/__init__.py | |
| parent | b076c10d00ee2cb4d465291a4ef0a4be9f048d9a (diff) | |
| parent | de391e88e0a7e75cd977f162a883aa5ffdbdc591 (diff) | |
| download | paramiko-752507a2978b0c6091ee737cd37ba1cb690926a2.tar.gz | |
Merge branch 'master' into 267-int
Conflicts:
paramiko/client.py
paramiko/transport.py
sites/www/changelog.rst
Diffstat (limited to 'paramiko/__init__.py')
| -rw-r--r-- | paramiko/__init__.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/paramiko/__init__.py b/paramiko/__init__.py index 6d133c4b..9e2ba013 100644 --- a/paramiko/__init__.py +++ b/paramiko/__init__.py @@ -17,14 +17,13 @@ # 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.0" -__version_info__ = tuple([ int(d) for d in __version__.split(".") ]) __license__ = "GNU Lesser General Public License (LGPL)" |