Merge pull request #1 from slowpokefarm/master

Proxy protocols support

api.py

@@ -34,6 +34,11 @@
 from .prepare import get_credentials
 from .prepare import delete_credentials
 
+try:
+    from urllib.parse import urlparse
+except ImportError:
+     from urlparse import urlparse
+
 # The urllib library was split into other modules from Python 2 to Python 3
 if sys.version_info.major == 3:
     import urllib.parse
@@ -77,9 +82,11 @@ def login(self, username=None, password=None, force=False, proxy=None):
         if (not self.isLoggedIn or force):
             self.session = requests.Session()
             if self.proxy is not None:
+                parsed = urlparse(self.proxy)
+                scheme = 'http://' if not parsed.scheme else ''
                 proxies = {
-                    'http': 'http://' + self.proxy,
-                    'https': 'http://' + self.proxy,
+                    'http': scheme + self.proxy,
+                    'https': scheme + self.proxy,
                 }
                 self.session.proxies.update(proxies)
             if (
@@ -636,7 +643,7 @@ def getTotalUserFeed(self, usernameId, minTimestamp=None):
             if "more_available" not in temp or temp["more_available"] is False:
                 return user_feed
             next_max_id = temp["next_max_id"]
-
+            
     def getTotalHashtagFeed(self, hashtagString, amount=100):
         hashtag_feed = []
         next_max_id = ''