remove python2 code

bin/webui.py

@@ -8,10 +8,7 @@
 import locale
 import os
 import sys
-try:
-    from urllib.parse import urlsplit
-except ImportError: # python2
-    from urlparse import urlsplit
+from urllib.parse import urlsplit
 
 from redbot import __version__
 from redbot.resource.robot_fetch import RobotFetcher
@@ -151,10 +148,7 @@ def cgi_main():
     """Run REDbot as a CGI Script."""
     def out(inbytes):
         try:
-            if hasattr(sys.stdout, 'buffer'):
-                sys.stdout.buffer.write(inbytes)
-            else: # python2
-                sys.stdout.write(inbytes)                
+            sys.stdout.buffer.write(inbytes)             
             sys.stdout.flush()
         except IOError: 
             pass

redbot/formatter/har.py

@@ -6,10 +6,8 @@
 
 
 import datetime
-try:
-    import json
-except ImportError: # python2
-    import simplejson as json
+import json
+
 
 from thor.http import get_header
 from redbot import __version__

redbot/formatter/html.py

@@ -13,11 +13,7 @@
 import os
 import re
 import textwrap
-try:
-    from urllib.parse import urljoin, quote as urlquote
-except ImportError: # python2
-    from urlparse import urljoin
-    from urllib import quote as urlquote
+from urllib.parse import urljoin, quote as urlquote
 
 from markdown import markdown
 

redbot/formatter/text.py

@@ -4,11 +4,7 @@
 HAR Formatter for REDbot.
 """
 
-
-try:
-    from html.parser import HTMLParser
-except ImportError: # python2
-    from HTMLParser import HTMLParser
+from html.parser import HTMLParser
 import operator
 import re
 import textwrap

redbot/message/__init__.py

@@ -9,11 +9,7 @@
 import hashlib
 import re
 import time
-try:
-    from urllib.parse import urlsplit, urlunsplit, quote as urlquote
-except ImportError: # python2
-    from urlparse import urlsplit, urlunsplit
-    from urllib import quote as urlquote
+from urllib.parse import urlsplit, urlunsplit, quote as urlquote
 import zlib
 
 from redbot.message.headers import HeaderProcessor

redbot/message/headers/_utils.py

@@ -2,12 +2,7 @@
 import calendar
 from email.utils import parsedate as lib_parsedate
 import re
-try:
-    from urllib.parse import unquote as urlunquote
-except ImportError: # python2
-    from urllib import unquote as unquote_to_bytes
-    def urlunquote(instr):
-        return unquote_to_bytes(instr.encode('ascii', 'replace')).decode('utf-8', 'replace')
+from urllib.parse import unquote as urlunquote
 
 from redbot.syntax import rfc7231
 from ._notes import *

redbot/message/headers/location.py

@@ -1,10 +1,7 @@
 #!/usr/bin/env python
 
 import re
-try:
-    from urllib.parse import urljoin
-except ImportError: # python2
-    from urlparse import urljoin
+from urllib.parse import urljoin
 
 from redbot.message import headers
 from redbot.speak import Note, categories, levels

redbot/message/headers/set_cookie.py

@@ -3,10 +3,7 @@
 
 from calendar import timegm
 from re import match, split
-try:
-    from urllib.parse import urlsplit
-except ImportError: # python2
-    from urlparse import urlsplit
+from urllib.parse import urlsplit
 
 from redbot.message import headers
 from redbot.speak import Note, categories, levels

redbot/message/link_parse.py

@@ -4,12 +4,8 @@
 Parse links from a stream of HTML data.
 """
 
-try:
-    from html.entities import entitydefs
-    from html.parser import HTMLParser
-except ImportError: # python2
-    from htmlentitydefs import entitydefs
-    from HTMLParser import HTMLParser
+from html.entities import entitydefs
+from html.parser import HTMLParser
 
 from redbot.message import headers
 from redbot.syntax import rfc7231

redbot/resource/__init__.py

@@ -11,10 +11,7 @@
 See webui.py for the Web front-end.
 """
 
-try:
-    from urllib.parse import urljoin
-except ImportError: # python2
-    from urlparse import urljoin
+from urllib.parse import urljoin
 
 import thor
 

redbot/resource/robot_fetch.py

@@ -8,12 +8,8 @@
 
 import hashlib
 from os import path
-try:
-    from urllib.robotparser import RobotFileParser
-    from urllib.parse import urlsplit
-except ImportError: # python2
-    from robotparser import RobotFileParser
-    from urlparse import urlsplit
+from urllib.robotparser import RobotFileParser
+from urllib.parse import urlsplit
 
 import thor
 

redbot/webui.py

@@ -10,11 +10,7 @@
 import sys
 import tempfile
 import time
-try:
-    from urllib.parse import parse_qs, urlsplit
-except ImportError: # python2
-    from cgi import parse_qs
-    from urlparse import urlsplit
+from urllib.parse import parse_qs, urlsplit
 import zlib
 
 import thor