urllib2 -> requests iekš logina

ltcproxy.py

@@ -12,15 +12,21 @@ usage: %s start|stop|restart|manualstart [options]
 __version__ = "0.1b"
 
 import os, sys, time
-import urllib,urlparse, urllib2, requests
+import urllib
 from urllib import unquote, quote
-import re, json
+import urlparse
+import requests
+import re
+import json
 import ConfigParser, getopt
 import arrow
 from diskcache import Cache
 import daemonize
 import bottle
 from bottle import Bottle, hook, response, route, request, run
+import urllib3
+urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
+
 
 cunicode = lambda s: s.decode("utf8") if isinstance(s, str) else s
 cstr = lambda s: s.encode("utf8") if isinstance(s, unicode) else s
@@ -474,23 +480,27 @@ Content-Type: application/x-www-form-urlencoded; charset=UTF-8
 Host: manstv.lattelecom.tv
 """ )
     try:
-        r = urllib2.Request(url, data=params, headers=headers)
-        u = urllib2.urlopen(r)
-        content = u.read()
-        u.close()
+        r = requests.post(url, data=params, headers=headers)
     except Exception as ex:
         if DEBUG:
-            print "Login error: %s - %s" % (ex.code, ex.msg)
-            print ex.hdrs
+            print "Login exception - %s " % (str(ex))
+            if "hdrs" in dir(ex):
+                print ex.hdrs
         return None
-    if u and "token" in content:
-        token = re.search('"token":"(.+?)"', content).group(1)
-        return token
-    else:
+    if not r.ok:
+        if DEBUG:
+            print "Login error - %s: %s" % (r.status_code, r.reason)
+        return None
+
+    content = r.content
+    if not "token" in content:
         if DEBUG:
             print "Error searching token in response"
             print content
-        return False
+        return None
+    token = re.search('"token":"(.+?)"', content).group(1)
+    return token
+
 
 def refresh_token(token):
     """Refresh"""
@@ -501,19 +511,28 @@ def refresh_token(token):
 User-Agent: Shortcut.lv v2.9.1 / Dalvik/1.6.0 (Linux; U; Android 4.4.2; SM-G900FD Build/KOT49H)
 Content-Type: application/x-www-form-urlencoded; charset=UTF-8
 Host: manstv.lattelecom.tv
-""" )
+""")
     try:
-        r = urllib2.Request(url, data=params, headers=headers)
-        u = urllib2.urlopen(r)
-        content = u.read()
-        u.close()
+        r = requests.post(url, data=params, headers=headers)
     except Exception as ex:
+        if DEBUG:
+            print "Login exception - %s " % (str(ex))
+            if "hdrs" in dir(ex):
+                print ex.hdrs
         return None
-    if r and "token" in content:
-        token2 = re.search('"token":"(.+?)"', content).group(1)
-        return token2
-    else:
-        return False
+    if not r.ok:
+        if DEBUG:
+            print "Login error - %s: %s" % (r.status_code, r.reason)
+        return None
+
+    content = r.content
+    if not "token" in content:
+        if DEBUG:
+            print "Error searching token in response"
+            print content
+        return None
+    token2 = re.search('"token":"(.+?)"', content).group(1)
+    return token2
 
 def print_headers(headers):
     for h in headers: