summaryrefslogtreecommitdiff
path: root/paramiko/common.py
diff options
context:
space:
mode:
authorRobey Pointer <robey@lag.net>2004-04-07 06:07:29 +0000
committerRobey Pointer <robey@lag.net>2004-04-07 06:07:29 +0000
commit1af636000743dcd43f17ad79d5b59aa83e1bc384 (patch)
treed2056c9d2e7cb6694990cc9e5a92c0d7a0cb22de /paramiko/common.py
parent68c8a9b2e69f0d5f4f350b26ac1998d26a22dac4 (diff)
downloadparamiko-1af636000743dcd43f17ad79d5b59aa83e1bc384.tar.gz
[project @ Arch-1:robey@lag.net--2003-public%secsh--dev--1.0--patch-44]
add get_username() method for remembering who you auth'd as add get_username() method for remembering who you auth'd as. also, fix these bugs: * "continue" auth response counted as a failure (in server mode). * try to import 'logging' in py22 before falling back to the fake logger, in case they have a backported version of 'logger' * raise the right exception when told to read a private key from a file that isn't a private key file * tell channels to close when the transport dies
Diffstat (limited to 'paramiko/common.py')
-rw-r--r--paramiko/common.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/paramiko/common.py b/paramiko/common.py
index e5aaaf8a..88e8b1aa 100644
--- a/paramiko/common.py
+++ b/paramiko/common.py
@@ -62,7 +62,10 @@ randpool.randomize()
import sys
if sys.version_info < (2, 3):
- import logging22 as logging
+ try:
+ import logging
+ except:
+ import logging22 as logging
import select
PY22 = True
else: