Numerous pycharm warnings resolved

This includes:

* Better ways of checking empty lists
* Not shadowing builtin functions like filter
* Preventing invalid slash warnings by marking strings as regexps
* Removing unnecessary brackets
* Lowercase variable names
* Adding/updating parameters in docstrings
* Removing unused code (lines not chunks)
* Change in not a member tests
* Changing some methods to static
* Shorting range membership checks
* Missing parameters
* Make some exception handlers more specific
* Don't define a lambda to a variable
* A few more instance checks to help type checkers
This commit is contained in:
Mike Auty
2018-12-16 13:21:06 +00:00
parent 29d41470a4
commit 9824538bd9
30 changed files with 116 additions and 84 deletions
+3 -2
View File
@@ -67,7 +67,7 @@ class ResourceAccessor(object):
temp_filename = os.path.join(constants.CACHE_PATH,
"data_" + hashlib.sha512(bytes(url, 'latin-1')).hexdigest())
if not temp_filename in self._cached_files or not os.path.exists(temp_filename):
if temp_filename not in self._cached_files or not os.path.exists(temp_filename):
vollog.info("Caching file at: {}".format(temp_filename))
try:
@@ -154,7 +154,8 @@ class JarHandler(urllib.request.BaseHandler):
http://developer.java.sun.com/developer/onlineTraining/protocolhandlers/
"""
def default_open(self, req):
@staticmethod
def default_open(req):
"""Handles the request if it's the jar scheme"""
if req.type == 'jar':
subscheme, remainder = req.full_url.split(":")[1], ":".join(req.full_url.split(":")[2:])
-1
View File
@@ -207,7 +207,6 @@ class Intel(interfaces.layers.TranslationLayerInterface):
@property
def dependencies(self) -> List[str]:
"""Returns a list of the lower layer names that this layer is dependent upon"""
# TODO: Add in the whole buffalo
return [self._base_layer] + self._swap_layers
@classmethod
+3 -3
View File
@@ -37,7 +37,7 @@ class BufferDataLayer(interfaces.layers.DataLayerInterface):
"""Reads the data from the buffer"""
if not self.is_valid(address, length):
invalid_address = address
if self.minimum_address < address and address <= self.maximum_address:
if self.minimum_address < address <= self.maximum_address:
invalid_address = self.maximum_address + 1
raise exceptions.InvalidAddressException(self.name, invalid_address,
"Offset outside of the buffer boundaries")
@@ -115,7 +115,7 @@ class FileLayer(interfaces.layers.DataLayerInterface):
"""Reads from the file at offset for length"""
if not self.is_valid(offset, length):
invalid_address = offset
if self.minimum_address < offset and offset <= self.maximum_address:
if self.minimum_address < offset <= self.maximum_address:
invalid_address = self.maximum_address + 1
raise exceptions.InvalidAddressException(self.name, invalid_address,
"Offset outside of the buffer boundaries")
@@ -137,7 +137,7 @@ class FileLayer(interfaces.layers.DataLayerInterface):
"""
if not self.is_valid(offset, len(data)):
invalid_address = offset
if self.minimum_address < offset and offset <= self.maximum_address:
if self.minimum_address < offset <= self.maximum_address:
invalid_address = self.maximum_address + 1
raise exceptions.InvalidAddressException(self.name, invalid_address,
"Data segment outside of the " + self.name + " file boundaries")
+2 -2
View File
@@ -168,7 +168,7 @@ class RegistryHive(interfaces.layers.TranslationLayerInterface):
"""Translates a single cell index to a cell memory offset and the suboffset within it"""
# Ignore the volatile bit when determining maxaddr validity
if (offset & 0x7fffffff > self._maxaddr):
if offset & 0x7fffffff > self._maxaddr:
raise RegistryInvalidIndex("Mapping request for value greater than maxaddr")
volatile = self._mask(offset, 31, 31) >> 31
@@ -187,7 +187,7 @@ class RegistryHive(interfaces.layers.TranslationLayerInterface):
ignore_errors: bool = False) -> Iterable[Tuple[int, int, int, str]]:
# TODO: Check the offset and offset + length are not outside the norms
if (length < 0):
if length < 0:
raise ValueError("Mapping length of RegistryHive must be positive or zero")
response = []