Linting changes

tests/Analysis/test_Honeyagent.py

@@ -60,7 +60,7 @@ def test_analyze(self, mocked_post):
         with open(jar_path, "rb") as f:
             data = f.read()
 
-        json_data = lambda: {
+        json_data = lambda: {  # noqa: E731
             "result": {
                 "files": {"file": "test"},
                 "yara": {"heuristics": [{"rule": "LocalFileAccess"}]},

tests/Classifier/test_Classifiers.py

@@ -1,10 +1,8 @@
 import os
-import shutil
 import hashlib
 import logging
 
 from thug.ThugAPI.ThugAPI import ThugAPI
-from thug.Logging.ThugLogging import ThugLogging
 
 log = logging.getLogger("Thug")
 

tests/DOM/test_HTTPSession.py

@@ -1,4 +1,3 @@
-import os
 import logging
 import pytest
 
@@ -27,18 +26,18 @@ def __getitem__(self, key):
 class TestHTTPSession(object):
     def test_invalid_proxy_1(self):
         with pytest.raises(SystemExit):
-            s = HTTPSession("invalid")
+            HTTPSession("invalid")
 
     def test_invalid_proxy_2(self):
         with pytest.raises(SystemExit):
-            s = HTTPSession("foo://bar")
+            HTTPSession("foo://bar")
 
     def test_invalid_proxy_3(self):
         with pytest.raises(ValueError):
-            s = HTTPSession("socks5://127.0.0.1:10000")
+            HTTPSession("socks5://127.0.0.1:10000")
 
     def test_valid_proxy(self):
-        s = HTTPSession(proxy="http://antifork.org:443")
+        HTTPSession(proxy="http://antifork.org:443")
 
     def test_normalize_1(self):
         window = WindowDict()

tests/DOM/test_JSInspector.py

@@ -1,4 +1,3 @@
-import os
 import logging
 
 import thug

tests/DOM/test_Location.py

@@ -1,4 +1,3 @@
-import os
 import logging
 
 import thug

tests/DOM/test_MimeTypes.py

@@ -1,4 +1,3 @@
-import os
 import logging
 
 import thug

tests/DOM/test_Personality.py

@@ -1,4 +1,3 @@
-import os
 import logging
 
 import thug

tests/DOM/test_SchemeHandler.py

@@ -1,4 +1,3 @@
-import os
 import logging
 
 import thug

tests/Logging/modules/test_MongoDB.py

@@ -1,5 +1,4 @@
 # coding=utf-8
-import os
 import logging
 import pymongo
 from mock import patch

tests/ThugAPI/test_ThugAPI.py

@@ -5,7 +5,6 @@
 import pytest
 
 from thug.ThugAPI.ThugAPI import ThugAPI
-from thug.ThugAPI.OpaqueFilter import OpaqueFilter
 
 log = logging.getLogger("Thug")
 

tests/ThugAPI/test_ThugOpts.py

@@ -1,4 +1,3 @@
-import os
 import pytest
 import logging
 

tests/ThugAPI/test_Watchdog.py

@@ -1,4 +1,3 @@
-import os
 import logging
 import time
 

tests/functional/test_brokenurl.py

@@ -1,4 +1,3 @@
-import os
 import logging
 
 from thug.ThugAPI.ThugAPI import ThugAPI

tests/functional/test_image_processing.py

@@ -1,4 +1,3 @@
-import os
 import logging
 
 from thug.ThugAPI.ThugAPI import ThugAPI

tests/functional/test_mimehandler.py

@@ -42,4 +42,4 @@ def test_svg_xml_handler(self, caplog):
         sample = os.path.join(self.misc_path, "testSVGXMLHandler.html")
 
         expected = ["[Window] Alert Text: Hello from SVG Javascript"]
-        self.do_perform_test(caplog, sample, "local")
+        self.do_perform_test(caplog, sample, expected, "local")

tests/functional/test_misc_chrome.py

@@ -464,18 +464,6 @@ def test_getElementsByTagName(self, caplog):
 
         self.do_perform_test(caplog, sample, expected)
 
-    def test_getElementsByTagName(self, caplog):
-        sample = os.path.join(self.misc_path, "testGetElementsByTagName.html")
-        expected = [
-            "[object HTMLHtmlElement]",
-            "[object HTMLHeadElement]",
-            "[object HTMLBodyElement]",
-            "[object HTMLParagraphElement]",
-            "[object HTMLScriptElement]",
-        ]
-
-        self.do_perform_test(caplog, sample, expected)
-
     def test_testDocumentElement(self, caplog):
         sample = os.path.join(self.misc_path, "testDocumentElement.html")
         expected = ['<a href="http://www.google.com">Google</a>']

tests/functional/test_misc_ie90.py

@@ -435,6 +435,8 @@ def test_testMicrosoftXMLHTTPEvent8(self, caplog):
             "confirm: true",
         ]
 
+        self.do_perform_test(caplog, sample, expected)
+
     def test_testMicrosoftXMLHTTPEvent9(self, caplog):
         sample = os.path.join(self.misc_path, "testMicrosoftXMLHTTPEvent9.html")
         expected = ["[Window] Alert Text: Request completed"]

tests/functional/test_screenshot.py

@@ -1,4 +1,3 @@
-import os
 import logging
 
 from thug.ThugAPI.ThugAPI import ThugAPI

tools/distributed/thugctrl.py

@@ -136,7 +136,7 @@ def __init__(self, configfile):
     def read_config(self):
         """Read config from config file"""
 
-        conf = ConfigParser.ConfigParser()
+        conf = configparser.ConfigParser()
         conf.read(self.configfile)
         self.host = conf.get("jobs", "host")
         self.queue = conf.get("jobs", "queue")