beautify the code

Author: yuantailing

cli.py

@@ -11,11 +11,9 @@
 import tunet
 
 if sys.version_info[0] == 2:
-    import urllib2
-    URLError = urllib2.URLError
+    from urllib2 import URLError
 else:
-    import urllib.error
-    URLError = urllib.error.URLError
+    from urllib.error import URLError
 
 
 if __name__ == '__main__':

test.py

@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 import pprint
 import tunet
 
@@ -9,5 +7,5 @@
 
 if __name__ == '__main__':
     pprint.pprint(tunet.auth4.checklogin())
-    pprint.pprint(tunet.auth4.login(username, password))
+    pprint.pprint(tunet.auth4.login(username, password, net=True))
     pprint.pprint(tunet.net.checklogin())

tunet.py

@@ -135,7 +135,7 @@ def read_callback(res):
         args = json.loads(page)
         return args
 
-    def _get_challenge(ipv, username, ip):
+    def get_challenge(ipv, username, ip):
         url = _URL_GET_CHALLENGE.format(ipv)
         data = {
             'callback': _JSONP_FUNCNAME,
@@ -155,7 +155,7 @@ def _auth_login(ipv, username, password, net=False, ip=''):
             username = '{:s}@tsinghua'.format(username)\
 
         url = _URL_SRUN_PORTAL.format(ipv)
-        challenge = _get_challenge(ipv, username, ip)
+        challenge = get_challenge(ipv, username, ip)
         ip = ip or challenge['online_ip']
         ac_id = get_ac_id(ip)
         n = 200
@@ -214,7 +214,7 @@ def _auth_checklogin(ipv):
     def _auth_logout(ipv, ip=''):
         url = _URL_SRUN_PORTAL.format(ipv)
         username = 'placeholder'
-        challenge = _get_challenge(ipv, username, ip)
+        challenge = get_challenge(ipv, username, ip)
 
         ac_id = 1
         n = 200