Update for compatibility with Python 3.6

Author: lyndsysimon

src/UniversalAnalytics/HTTPLog.py

@@ -17,7 +17,6 @@
 import sys
 
 # Third party libraries
-from six.moves import cStringIO as StringIO  # Used by tests
 import six
 
 

src/UniversalAnalytics/Tracker.py

@@ -103,12 +103,9 @@ def debug():
         """
         Activate debugging on urllib2.
         """
-        if six.PY2:
-            handler = HTTPSHandler(debuglevel=1)
-            opener = build_opener(handler)
-            install_opener(opener)
-        else:
-            http_client.HTTPConnection.debuglevel = 1
+        handler = HTTPSHandler(debuglevel=1)
+        opener = build_opener(handler)
+        install_opener(opener)
 
     @classmethod
     def fixUTF8(cls, data):  # Ensure proper encoding for UA's servers...

test/test_everything.py

@@ -16,6 +16,7 @@
 import unittest
 
 # Third party imports
+from six.moves import cStringIO as StringIO
 from six.moves import urllib
 
 # Local imports
@@ -26,7 +27,7 @@
 class UAMPythonTestCase(unittest.TestCase):
 
     def setUp(self):
-        self._buffer = HTTPLog.StringIO()
+        self._buffer = StringIO()
         # Capture HTTP output in readible fashion
         HTTPLog.consume(self._buffer)
         Tracker.HTTPPost.debug()  # Enabled debugging from urllib2