Apply minor rewrites

Author: evilaliv3

tor2web/t2w.py

@@ -901,8 +901,6 @@ def process(self):
                         defer.returnValue(
                             flattenString(self, antanistaticmap[staticpath]).addCallback(self.writeContent))
 
-                
-
             except Exception:
                 pass
 
@@ -1143,7 +1141,6 @@ def allContentReceived(self):
             self._savedTimeOut = self.setTimeout(None)
 
 
-
 class T2WProxyFactory(http.HTTPFactory):
     protocol = T2WProxy
 
@@ -1451,6 +1448,7 @@ def umask(mask):
     ipv4 = None
 else:
     ipv4 = config.listen_ipv4
+
 ipv6 = config.listen_ipv6
 
 # ##############################################################################
@@ -1475,17 +1473,15 @@ def umask(mask):
 if os.path.exists(sys_static_dir):
     for root, dirs, files in os.walk(os.path.join(sys_static_dir)):
         for basename in files:
-            filename = os.path.join(root, basename)
-            f = FilePath(filename)
+            f = FilePath(os.path.join(root, basename))
             antanistaticmap[filename.replace(sys_static_dir, "")] = f.getContent()
 
 # user defined static files
 usr_static_dir = os.path.join(config.datadir, "static/")
 if usr_static_dir != sys_static_dir and os.path.exists(usr_static_dir):
     for root, dirs, files in os.walk(os.path.join(usr_static_dir)):
         for basename in files:
-            filename = os.path.join(root, basename)
-            f = FilePath(filename)
+            f = FilePath(os.path.join(root, basename))
             antanistaticmap[filename.replace(usr_static_dir, "")] = f.getContent()
 # ##############################################################################
 

tor2web/utils/config.py

@@ -76,7 +76,7 @@ def __init__(self):
         self.__dict__['sockretryautomatically'] = True
         self.__dict__['cipher_list'] = 'ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-SHA384:' \
                                        'ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-SHA256:' \
-                                       'ECDHE-RSA-AES256-SHA:DHE-DSS-AES256-SHA:DHE-RSA-AES128-SHA:'
+                                       'ECDHE-RSA-AES256-SHA:DHE-DSS-AES256-SHA:DHE-RSA-AES128-SHA'
         self.__dict__['mode'] = 'BLOCKLIST'
         self.__dict__['onion'] = None
         self.__dict__['blockhotlinking'] = True