Fixing build https://circleci.com/gh/andresriancho/w3af/1182

andresriancho · Dec 31, 2014 · e4d4d84 · e4d4d84
1 parent c86833d
commit e4d4d84
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 6 deletions.
diff --git a/w3af/core/controllers/core_helpers/consumers/auth.py b/w3af/core/controllers/core_helpers/consumers/auth.py
@@ -34,8 +34,8 @@ class auth(BaseConsumer):
 
     def __init__(self, auth_plugins, w3af_core, timeout):
         """
-        :param in_queue: A queue that's used to communicate with the thread. Items
-                         that might appear in this queue are:
+        :param in_queue: A queue that's used to communicate with the thread.
+                         Items that might appear in this queue are:
                              * POISON_PILL
                              * FORCE_LOGIN
         :param auth_plugins: Instances of auth plugins in a list
@@ -56,7 +56,9 @@ def run(self):
             try:
                 action = self.in_queue.get(timeout=self._timeout)
             except Queue.Empty:
+                # pylint: disable=E1120
                 self._login()
+                # pylint: enable=E1120
             else:
 
                 if action == POISON_PILL:
@@ -68,9 +70,10 @@ def run(self):
                     break
 
                 elif action == FORCE_LOGIN:
-
+                    # pylint: disable=E1120
                     self._login()
                     self.in_queue.task_done()
+                    # pylint: enable=E1120
 
     # Adding task here because we want to let the rest of the world know
     # that we're still doing something. The _task_done below will "undo"
@@ -92,4 +95,6 @@ def async_force_login(self):
         self.in_queue_put(FORCE_LOGIN)
 
     def force_login(self):
+        # pylint: disable=E1120
         self._login()
+        # pylint: enable=E1120
diff --git a/w3af/core/controllers/core_helpers/consumers/base_consumer.py b/w3af/core/controllers/core_helpers/consumers/base_consumer.py
@@ -118,8 +118,10 @@ def run(self):
                 break
 
             else:
+                # pylint: disable=E1120
                 self._consume_wrapper(work_unit)
                 self.in_queue.task_done()
+                # pylint: enable=E1120
 
     def _teardown(self):
         raise NotImplementedError

diff --git a/w3af/core/controllers/core_helpers/consumers/crawl_infrastructure.py b/w3af/core/controllers/core_helpers/consumers/crawl_infrastructure.py
@@ -76,7 +76,9 @@ def run(self):
             try:
                 work_unit = self.in_queue.get(timeout=0.1)
             except Queue.Empty:
+                # pylint: disable=E1120
                 self._route_all_plugin_results()
+                # pylint: enable=E1120
             else:
                 if work_unit == POISON_PILL:
 
@@ -135,7 +137,9 @@ def _consume(self, function_id, work_unit):
             self._threadpool.apply_async(return_args(self._discover_worker),
                                         (plugin, work_unit,),
                                          callback=self._plugin_finished_cb)
+            # pylint: disable=E1120
             self._route_all_plugin_results()
+            # pylint: enable=E1120
 
     @task_decorator
     def _plugin_finished_cb(self,
@@ -144,7 +148,9 @@ def _plugin_finished_cb(self,
         if not self._running:
             return
 
+        # pylint: disable=E1120
         self._route_plugin_results(plugin)
+        # pylint: enable=E1120
 
     @task_decorator
     def _route_all_plugin_results(self, function_id):
@@ -156,7 +162,9 @@ def _route_all_plugin_results(self, function_id):
             if plugin in self._disabled_plugins:
                 continue
 
+            # pylint: disable=E1120
             self._route_plugin_results(plugin)
+            # pylint: enable=E1120
 
     @task_decorator
     def _route_plugin_results(self, function_id, plugin):

diff --git a/w3af/core/controllers/tests/pylint_plugins/hashlib_fix.py b/w3af/core/controllers/tests/pylint_plugins/hashlib_fix.py
@@ -30,18 +30,28 @@ def update(self, x):
         return u''
     def digest(self):
         return u''
+
+class sha256(object):
+    def __init__(self, value): pass
+    def hexdigest(self):
+        return u''
+    def update(self, x):
+        return u''
+    def digest(self):
+        return u''
 """
 
+
 def hashlib_transform(module):
     if module.name == 'hashlib':
         fake = ASTNGBuilder(MANAGER).string_build(CODE_FIX)
 
-        for hashfunc in ('sha1', 'md5', 'sha512'):
+        for hashfunc in ('sha1', 'md5', 'sha512', 'sha256'):
             module.locals[hashfunc] = fake.locals[hashfunc]
 
+
 def register(linter):
-    """called when loaded by pylint --load-plugins, register our tranformation
+    """called when loaded by pylint --load-plugins, register our transformation
     function here
     """
     MANAGER.register_transformer(hashlib_transform)
-