From: CMDR furrycat <elite@furrycat.net>
Date: Fri, 4 Nov 2016 11:06:01 +0000 (+0000)
Subject: We require python3 so don't test for it.
X-Git-Url: http://git.furryclan.net/?a=commitdiff_plain;h=406bc828f9928448420d183d426c54a603c61ebf;p=furrycat%2Fcatbot.git

We require python3 so don't test for it.
---

diff --git a/bot.py b/bot.py
index 3ac1952..7544d83 100644
--- a/bot.py
+++ b/bot.py
@@ -9,11 +9,7 @@ import random
 import re
 import sys
 import time
-
-if sys.version_info >= (3, 0):
-  import urllib.request
-else:
-  import urllib2
+import urllib.request
 
 variables = {
   'dryrun': multiprocessing.Value('b', os.getenv('DRYRUN') is not None),
@@ -154,32 +150,16 @@ def parse_channel(text, *, text_ok = True, voice_ok = True):
   return None
 
 def open_url(url):
-  if sys.version_info >= (3, 0):
-    # Specify our own user agent as Cloudflare doesn't seem to like the urllib one
-    try:
-      request = urllib.request.Request(url, headers={'User-Agent': 'catbot'})
-      return urllib.request.urlopen(request)
-    except urllib.error.HTTPError as err:
-      log.error("Error {0} opening {1}: {2}".format(err.code, url, err.reason))
-      return None
-    except ValueError as err:
-      log.error('Invalid URL {}'.format(url))
-      return None
-  else:
-    sslctx = ssl.SSLContext(ssl.PROTOCOL_TLSv1)
-    # If we're on OSX with OpenSSL 0.9.x, manually specify preferred ciphers so CloudFlare can negotiate successfully
-    if platform.system() == 'Darwin' and ssl.OPENSSL_VERSION_INFO[0] < 1:
-      sslctx.set_ciphers("ECCdraft:HIGH:!aNULL")
-    # Specify our own user agent as Cloudflare doesn't seem to like the urllib one
-    try:
-      request = urllib2.Request(url, headers={'User-Agent': 'catbot'})
-      return urllib2.urlopen(request, context=sslctx)
-    except urllib2.HTTPError as err:
-      log.error("Error {0} opening {1}: {2}".format(err.code, url, err.reason))
-      return None
-    except ValueError as err:
-      log.error('Invalid URL {}'.format(url))
-      return None
+  # Specify our own user agent as Cloudflare doesn't seem to like the urllib one
+  try:
+    request = urllib.request.Request(url, headers={'User-Agent': 'catbot'})
+    return urllib.request.urlopen(request)
+  except urllib.error.HTTPError as err:
+    log.error("Error {0} opening {1}: {2}".format(err.code, url, err.reason))
+    return None
+  except ValueError as err:
+    log.error('Invalid URL {}'.format(url))
+    return None
 
 # Get my idle status.
 def status():