commit 040c963b15456b7d0ab1c8e17ef2eeef0a321444 Author: David Fifield david@bamsoftware.com Date: Fri Nov 8 12:47:10 2013 -0800
Remove unused M2Crypto.X509 imports.
It looks like all uses of X509 were removed in 454b735a. --- facilitator/facilitator-email-poller | 2 +- flashproxy-reg-appspot | 5 ++--- flashproxy-reg-email | 8 +++++--- 3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/facilitator/facilitator-email-poller b/facilitator/facilitator-email-poller index 3504c51..75f4ff2 100755 --- a/facilitator/facilitator-email-poller +++ b/facilitator/facilitator-email-poller @@ -19,7 +19,7 @@ import time import fac
from hashlib import sha1 -from M2Crypto import SSL, X509 +from M2Crypto import SSL
DEFAULT_IMAP_HOST = "imap.gmail.com" DEFAULT_IMAP_PORT = 993 diff --git a/flashproxy-reg-appspot b/flashproxy-reg-appspot index 884c112..87567ba 100755 --- a/flashproxy-reg-appspot +++ b/flashproxy-reg-appspot @@ -17,11 +17,10 @@ from flashproxy.keys import PIN_GOOGLE_CA_CERT, PIN_GOOGLE_PUBKEY_SHA1, check_ce from flashproxy.util import parse_addr_spec, format_addr
try: - from M2Crypto import SSL, X509 + from M2Crypto import SSL except ImportError: # Defer the error reporting so that --help works even without M2Crypto. SSL = None - X509 = None
DEFAULT_REMOTE_ADDRESS = None DEFAULT_REMOTE_PORT = 9000 @@ -200,7 +199,7 @@ else: usage(sys.stderr) sys.exit(1)
-if X509 is None: +if SSL is None: print >> sys.stderr, """\ This program requires the M2Crypto library, which is not installed.
diff --git a/flashproxy-reg-email b/flashproxy-reg-email index fa08d9f..b9b86b7 100755 --- a/flashproxy-reg-email +++ b/flashproxy-reg-email @@ -15,10 +15,12 @@ from flashproxy.keys import PIN_GOOGLE_CA_CERT, PIN_GOOGLE_PUBKEY_SHA1, DEFAULT_ from flashproxy.util import parse_addr_spec, format_addr
try: - from M2Crypto import BIO, RSA, SSL, X509 + from M2Crypto import BIO, RSA, SSL except ImportError: # Defer the error reporting so that --help works even without M2Crypto. - X509 = None + BIO = None + RSA = None + SSL = None
DEFAULT_REMOTE_ADDRESS = None DEFAULT_REMOTE_PORT = 9000 @@ -158,7 +160,7 @@ else: usage(sys.stderr) sys.exit(1)
-if X509 is None: +if SSL is None: print >> sys.stderr, """\ This program requires the M2Crypto library, which is not installed.