From bdd229afb401ab0e32847a1aa67b8d5dce9a6186 Mon Sep 17 00:00:00 2001 From: Griatch Date: Mon, 4 Apr 2016 22:13:26 +0200 Subject: [PATCH] Fixed IRC SSL implementation to handle a non-installed openssl library. --- evennia/server/portal/irc.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/evennia/server/portal/irc.py b/evennia/server/portal/irc.py index 5771df1085..95711c8612 100644 --- a/evennia/server/portal/irc.py +++ b/evennia/server/portal/irc.py @@ -9,7 +9,7 @@ from future.utils import viewkeys import re from twisted.application import internet from twisted.words.protocols import irc -from twisted.internet import protocol, reactor, ssl +from twisted.internet import protocol, reactor from evennia.server.session import Session from evennia.utils import logger, utils @@ -313,7 +313,7 @@ class IRCBotFactory(protocol.ReconnectingClientFactory): if self.port: if ssl: try: - import OpenSSL + from twisted.internet import ssl service = reactor.connectSSL(self.network, int(self.port), self, ssl.ClientContextFactory()) except ImportError: self.caller.msg("To use SSL, the PyOpenSSL module must be installed.")