Mixed bugfixing thanks to pylint debugger

tor2web · May 9, 2015 · 115193a · 115193a
1 parent 24bbce7
commit 115193a
Show file tree

Hide file tree

Showing 14 changed files with 16 additions and 258 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,5 +1,5 @@
 Tor2web
-Copyright (C) 2012 Hermes No Profit Association - GlobaLeaks Project
+Copyright (C) 2011-2015 Hermes No Profit Association - GlobaLeaks Project
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Affero General Public License as published by

diff --git a/tor2web/t2w.py b/tor2web/t2w.py
@@ -1,21 +1,3 @@
-"""
-    Tor2web
-    Copyright (C) 2012 Hermes No Profit Association - GlobaLeaks Project
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-"""
-
 """
 
 :mod:`Tor2Web`
@@ -64,7 +46,6 @@
 from twisted.python.compat import networkString, intToBytes
 from twisted.python.failure import Failure
 from twisted.python.filepath import FilePath
-from twisted.python.log import err
 from twisted.internet.task import LoopingCall
 from tor2web import __version__
 from tor2web.utils.config import Config
@@ -231,7 +212,7 @@ def spawnT2W(father, childFDs, fds_https, fds_http):
                                 childFDs=childFDs)
 
 
-class Tor2webObj():
+class Tor2webObj(object):
     def __init__(self):
         # The destination hidden service identifier
         self.onion = None
@@ -439,12 +420,6 @@ def __init__(self, channel, queued, reactor=reactor):
 
         self.translation_rexp = {}
 
-    def finish(self):
-        try:
-            http.Request.finish()
-        except Exception:
-            pass
-
     def getRequestHostname(self):
         """
             Function overload to fix ipv6 bug:
@@ -496,7 +471,7 @@ def getForwarders(self):
                                                               port))
                     else:
                         raise Exception
-        except:
+        except Exception:
             return []
 
         return forwarders
@@ -841,7 +816,7 @@ def process(self):
                         ctype = ctype[0]
 
                     if self.method == b"POST" and ctype:
-                        key, pdict = parse_header(ctype)
+                        key, _ = parse_header(ctype)
                         if key == b'application/x-www-form-urlencoded':
                             args.update(parse_qs(content, 1))
                     # ################################################################
@@ -923,7 +898,7 @@ def process(self):
 
                 else:
                     if type(antanistaticmap[staticpath]) == str:
-                        filename, ext = os.path.splitext(staticpath)
+                        _, ext = os.path.splitext(staticpath)
                         self.setHeader(b'content-type', mimetypes.types_map[ext])
                         content = antanistaticmap[staticpath]
                         defer.returnValue(self.contentFinish(content))
@@ -1560,7 +1535,7 @@ def daemon_shutdown(self):
     t2w_daemon.daemon_shutdown = daemon_shutdown
     t2w_daemon.rpc_server = T2WRPCServer(config)
 
-    t2w_daemon.run(config)
+    t2w_daemon.run()
 
 else:
     set_proctitle("tor2web-worker")

diff --git a/tor2web/utils/config.py b/tor2web/utils/config.py
@@ -1,21 +1,3 @@
-"""
-    Tor2web
-    Copyright (C) 2012 Hermes No Profit Association - GlobaLeaks Project
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-"""
-
 """
 
 :mod:`Tor2Web`
@@ -57,7 +39,7 @@ def __init__(self):
         parser.add_option("-n", "--nodaemon", dest="nodaemon", default=False, action="store_true")
         parser.add_option("-d", "--rundir", dest="rundir", default='/var/run/tor2web/')
         parser.add_option("-x", "--command", dest="command", default='start')
-        (options, args) = parser.parse_args()
+        options, _ = parser.parse_args()
 
         self._file = options.configfile
 

diff --git a/tor2web/utils/daemon.py b/tor2web/utils/daemon.py
@@ -1,21 +1,3 @@
-"""
-    Tor2web
-    Copyright (C) 2012 Hermes No Profit Association - GlobaLeaks Project
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-"""
-
 """
 
 :mod:`Tor2Web`
@@ -193,7 +175,6 @@ def change_uid(self):
             os.setuid(c_uid)
 
     def run(self, config):
-
         if self.config.command == 'status':
             if not self.is_process_running():
                 exit(1)

diff --git a/tor2web/utils/gettor.py b/tor2web/utils/gettor.py
@@ -1,21 +1,3 @@
-"""
-    Tor2web
-    Copyright (C) 2015 Hermes No Profit Association - GlobaLeaks Project
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-"""
-
 """
 
 :mod:`Tor2Web`
@@ -282,7 +264,7 @@ def getTorTask(config):
     try:
         with open (latest_tb_file, 'r') as version_file:
             current_version = version_file.read().replace('\n', '')
-    except:
+    except Exception:
         pass
 
     if current_version != latest_version:
@@ -324,5 +306,5 @@ def getTorTask(config):
             with open(latest_tb_file, 'w') as version_file:
                 version_file.write(latest_version)
 
-        except:
+        except Exception:
             pass
diff --git a/tor2web/utils/hostsmap.py b/tor2web/utils/hostsmap.py
@@ -1,21 +1,3 @@
-"""
-    Tor2web
-    Copyright (C) 2014 Hermes No Profit Association - GlobaLeaks Project
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-"""
-
 """
 
 :mod:`Tor2Web`
@@ -54,5 +36,5 @@ def read(self, path):
                         host = parts[0]
                         onion = parts[1]
                         self.hosts[host] = onion
-        except:
+        except Exception:
             pass
diff --git a/tor2web/utils/lists.py b/tor2web/utils/lists.py
@@ -1,21 +1,3 @@
-"""
-    Tor2web
-    Copyright (C) 2012 Hermes No Profit Association - GlobaLeaks Project
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-"""
-
 """
 
 :mod:`Tor2Web`
@@ -37,7 +19,6 @@
 from collections import OrderedDict
 from StringIO import StringIO
 
-from OpenSSL import SSL
 from twisted.internet import reactor, ssl
 from twisted.internet.task import LoopingCall
 from twisted.internet.defer import Deferred
@@ -213,14 +194,14 @@ def load(self):
         # simple touch to create non existent files
         try:
             open(self.filename, 'a').close()
-        except:
+        except Exception:
             pass
 
         try:
             with open(self.filename, 'r') as fh:
                 for l in fh.readlines():
                     self.add(re.split("#", l)[0].rstrip("[ , \n,\t]"))
-        except:
+        except Exception:
             pass
 
     def dump(self):
@@ -231,7 +212,7 @@ def dump(self):
             with open(self.filename, 'w') as fh:
                 for l in self:
                     fh.write(l + "\n")
-        except:
+        except Exception:
             pass
 
     def handleData(self, data):

diff --git a/tor2web/utils/mail.py b/tor2web/utils/mail.py
@@ -1,21 +1,3 @@
-"""
-    Tor2web
-    Copyright (C) 2012 Hermes No Profit Association - GlobaLeaks Project
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-"""
-
 """
 
 :mod:`Tor2Web`

diff --git a/tor2web/utils/misc.py b/tor2web/utils/misc.py
@@ -1,21 +1,3 @@
-"""
-    Tor2web
-    Copyright (C) 2012 Hermes No Profit Association - GlobaLeaks Project
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-"""
-
 """
 
 :mod:`Tor2Web`

diff --git a/tor2web/utils/socks.py b/tor2web/utils/socks.py
@@ -1,21 +1,3 @@
-"""
-    Tor2web
-    Copyright (C) 2012 Hermes No Profit Association - GlobaLeaks Project
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-"""
-
 """
 
 :mod:`Tor2Web`

diff --git a/tor2web/utils/ssl.py b/tor2web/utils/ssl.py
@@ -1,21 +1,3 @@
-"""
-    Tor2web
-    Copyright (C) 2012 Hermes No Profit Association - GlobaLeaks Project
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-"""
-
 """
 
 :mod:`Tor2Web`
@@ -34,7 +16,8 @@
 
 import os
 from OpenSSL import SSL
-from OpenSSL.crypto import load_certificate, dump_certificate, FILETYPE_PEM
+from OpenSSL.crypto import load_certificate, dump_certificate, FILETYPE_PEM,
+ _raise_current_error
 from pyasn1.type import univ, constraint, char, namedtype, tag
 from pyasn1.codec.der.decoder import decode
 from twisted.internet import ssl

diff --git a/tor2web/utils/stats.py b/tor2web/utils/stats.py
@@ -1,21 +1,3 @@
-"""
-    Tor2web
-    Copyright (C) 2012 Hermes No Profit Association - GlobaLeaks Project
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-"""
-
 """
 
 :mod:`Tor2Web`