r46966 - fix "nomodules" case
hawkowl-TA+aISz0psMTMxyoc4vAAJOcrHinNvQL0E9HWUfgJXw@public.gmane.org Thu, 10 Mar 2016 00:06:17 -0700 (MST)
| Newsgroups | gmane.comp.python.twisted.commits |
|---|---|
| Message-ID | <[email protected]> |
Author: hawkowl
Date: Thu Mar 10 00:06:13 2016
New Revision: 46966
Modified:
branches/manhole-hardcodedkey-8229/twisted/conch/test/test_recvline.py
Log:
fix "nomodules" case
Modified: branches/manhole-hardcodedkey-8229/twisted/conch/test/test_recvline.py
==============================================================================
--- branches/manhole-hardcodedkey-8229/twisted/conch/test/test_recvline.py (original)
+++ branches/manhole-hardcodedkey-8229/twisted/conch/test/test_recvline.py Thu Mar 10 00:06:13 2016
@@ -12,7 +12,6 @@
from twisted.conch.insults import insults
from twisted.conch import recvline
-from twisted.conch.ssh.keys import _getPersistentRSAKey
from twisted.python import reflect, components
from twisted.internet import defer, error
@@ -301,7 +300,8 @@
from twisted.cred import checkers
try:
- from twisted.conch.ssh import userauth, transport, channel, connection, session
+ from twisted.conch.ssh import (userauth, transport, channel, connection,
+ session, keys)
from twisted.conch.manhole_ssh import TerminalUser, TerminalSession, TerminalRealm, TerminalSessionTransport, ConchFactory
except ImportError:
ssh = False
@@ -471,7 +471,7 @@
[checkers.InMemoryUsernamePasswordDatabaseDontUse(**{u: p})])
sshFactory = ConchFactory(ptl)
- sshKey = _getPersistentRSAKey(self.mktemp(), keySize=512)
+ sshKey = keys._getPersistentRSAKey(self.mktemp(), keySize=512)
sshFactory.publicKeys["ssh-rsa"] = sshKey
sshFactory.privateKeys["ssh-rsa"] = sshKey