Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Porter <slug@qwebirc.org>2012-02-13 05:10:34 (GMT)
committer Chris Porter <slug@qwebirc.org>2012-02-13 05:10:34 (GMT)
commitd4cea9c7062f1b2b53918ec5f660e9d12fecd6cb (patch)
tree6e6f15ff195ac09755c7ac8a6f106f1b01050845
parent310067aa49dd2854cfdc70ba36114d0f14e60c9a (diff)
Fix ssl import.upstream
-rw-r--r--qwebirc/ircclient.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/qwebirc/ircclient.py b/qwebirc/ircclient.py
index 2fd09c0..8e06eae 100644
--- a/qwebirc/ircclient.py
+++ b/qwebirc/ircclient.py
@@ -1,6 +1,6 @@
import twisted, sys, codecs, traceback
from twisted.words.protocols import irc
-from twisted.internet import reactor, protocol, abstract, ssl
+from twisted.internet import reactor, protocol, abstract
from twisted.web import resource, server
from twisted.protocols import basic
from twisted.names.client import Resolver
@@ -153,6 +153,7 @@ def createIRC(*args, **kwargs):
if CONNECTION_RESOLVER is None:
if hasattr(config, "SSLPORT"):
+ from twisted.internet import ssl
reactor.connectSSL(config.IRCSERVER, config.SSLPORT, f, ssl.ClientContextFactory(), **tcpkwargs)
else:
reactor.connectTCP(config.IRCSERVER, config.IRCPORT, f, **tcpkwargs)