providers fixes

dbmail/providers/boxcar/push.py

@@ -1,7 +1,12 @@
 # -*- encoding: utf-8 -*-
 
-from httplib import HTTPSConnection
-from urllib import urlencode
+
+try:
+    from httplib import HTTPSConnection
+    from urllib import urlencode
+except ImportError:
+    from http.client import HTTPSConnection
+    from urllib.parse import urlencode
 
 from dbmail.providers.prowl.push import from_unicode
 from dbmail import get_version

dbmail/providers/centrifugo/push.py

@@ -1,10 +1,16 @@
 # -*- encoding: utf-8 -*-
 
+try:
+    from urllib2 import urlopen, Request
+    from urllib import urlencode
+except ImportError:
+    from urllib.request import urlopen, Request
+    from urllib.parse import urlencode
+
 import hmac
 from hashlib import sha256
 from json import dumps
-from urllib import urlencode
-from urllib2 import urlopen, Request
+
 
 from django.conf import settings
 

dbmail/providers/google/android.py

@@ -2,16 +2,12 @@
 
 try:
     from httplib import HTTPSConnection
-except ImportError:
-    from http.client import HTTPSConnection
-
-from json import dumps, loads
-
-try:
     from urlparse import urlparse
 except ImportError:
+    from http.client import HTTPSConnection
     from urllib.parse import urlparse
 
+from json import dumps, loads
 from django.conf import settings
 
 

dbmail/providers/http/push.py

@@ -1,7 +1,12 @@
 # -*- encoding: utf-8 -*-
 
-from httplib import HTTPConnection, HTTPSConnection
-from urlparse import urlparse
+try:
+    from httplib import HTTPConnection, HTTPSConnection
+    from urlparse import urlparse
+except ImportError:
+    from http.client import HTTPSConnection, HTTPConnection
+    from urllib.parse import urlparse
+
 from json import dumps
 
 from django.conf import settings

dbmail/providers/iqsms/sms.py

@@ -1,7 +1,12 @@
 # -*- encoding: utf-8 -*-
 
-from httplib import HTTPConnection
-from urllib import urlencode
+try:
+    from httplib import HTTPConnection
+    from urllib import urlencode
+except ImportError:
+    from http.client import HTTPConnection
+    from urllib.parse import urlencode
+
 from base64 import b64encode
 
 from django.conf import settings

dbmail/providers/parse_com/push.py

@@ -1,6 +1,10 @@
 # -*- encoding: utf-8 -*-
 
-from httplib import HTTPSConnection
+try:
+    from httplib import HTTPSConnection
+except ImportError:
+    from http.client import HTTPSConnection
+
 from json import dumps, loads
 
 from django.conf import settings

dbmail/providers/pushover/push.py

@@ -1,7 +1,12 @@
 # -*- encoding: utf-8 -*-
 
-from httplib import HTTPSConnection
-from urllib import urlencode
+try:
+    from httplib import HTTPSConnection
+    from urllib import urlencode
+except ImportError:
+    from http.client import HTTPSConnection
+    from urllib.parse import urlencode
+
 from json import loads
 
 from django.conf import settings

dbmail/providers/slack/push.py

@@ -1,8 +1,13 @@
 # -*- encoding: utf-8 -*-
 
-from httplib import HTTPSConnection
-from urllib import urlencode
-from urlparse import urlparse
+try:
+    from httplib import HTTPSConnection
+    from urlparse import urlparse
+    from urllib import urlencode
+except ImportError:
+    from http.client import HTTPSConnection
+    from urllib.parse import urlparse, urlencode
+
 from json import dumps
 
 from django.conf import settings

dbmail/providers/twilio/sms.py

@@ -1,7 +1,12 @@
 # -*- coding: utf-8 -*-
 
-from httplib import HTTPSConnection
-from urllib import urlencode
+try:
+    from httplib import HTTPSConnection
+    from urllib import urlencode
+except ImportError:
+    from http.client import HTTPSConnection
+    from urllib.parse import urlencode
+
 from base64 import b64encode
 from json import loads