From 52e223948d86eea133da358a99a86f55c2446a7d Mon Sep 17 00:00:00 2001
From: Ero Carrera <ero.carrera@gmail.com>
Date: Sun, 14 Apr 2019 19:12:46 +0200
Subject: [PATCH] Implemented the changes suggested in #218

---
 pefile.py | 33 +++++++++++----------------------
 1 file changed, 11 insertions(+), 22 deletions(-)

diff --git a/pefile.py b/pefile.py
index ccdfb37..52aa644 100644
--- a/pefile.py
+++ b/pefile.py
@@ -1161,7 +1161,7 @@ def get_hash_md5(self):
     def entropy_H(self, data):
         """Calculate the entropy of a chunk of data."""
 
-        if len(data) == 0:
+        if not data:
             return 0.0
 
         occurences = Counter(bytearray(data))
@@ -1368,9 +1368,7 @@ def __setattr__(self, name, val):
             if name == 'type':
                 word = (val << 12) | (word & 0xfff)
             elif name == 'rva':
-                offset = val-self.base_rva
-                if offset < 0:
-                    offset = 0
+                offset = max(val-self.base_rva, 0)
                 word = ( word & 0xf000) | ( offset & 0xfff)
 
             # Store the modified data
@@ -1443,10 +1441,7 @@ def is_valid_dos_filename(s):
         return False
     # Allow path separators as import names can contain directories.
     allowed = allowed_filename + b'\\/'
-    for c in set(s):
-        if c not in allowed:
-            return False
-    return True
+    return all(c in allowed for c in set(s))
 
 
 # Check if an imported name uses the valid accepted characters expected in mangled
@@ -1463,13 +1458,9 @@ def is_valid_dos_filename(s):
         string.digits + b'_?@$()<>')
 
 def is_valid_function_name(s):
-    if s is None or not isinstance(s, (str, bytes, bytearray)):
-        return False
-    for c in set(s):
-        if c not in allowed_function_name:
-            return False
-    return True
-
+    return (s is not None and
+        isinstance(s, (str, bytes, bytearray)) and
+        all(c in allowed_function_name for c in set(s)))
 
 
 class PE(object):
@@ -1757,8 +1748,7 @@ def __init__(self, name=None, data=None, fast_load=None):
         self.FileAlignment_Warning = False
         self.SectionAlignment_Warning = False
 
-        if not fast_load:
-            fast_load = globals()['fast_load']
+        fast_load = fast_load or globals()['fast_load']
         try:
             self.__parse__(name, data, fast_load)
         except:
@@ -1819,8 +1809,7 @@ def __parse__(self, fname, data, fast_load):
                 self.__from_file = True
             except IOError as excp:
                 exception_msg = '{0}'.format(excp)
-                if exception_msg:
-                    exception_msg = ': %s' % exception_msg
+                exception_msg = exception_msg and (': %s' % exception_msg)
                 raise Exception('Unable to access file \'{0}\'{1}'.format(fname, exception_msg))
             finally:
                 if fd is not None:
@@ -2333,7 +2322,7 @@ def parse_sections(self, offset):
                 self.__warnings.append(
                     'Invalid section {0}. Contents are null-bytes.'.format(i))
                 break
-            if len(section_data) == 0:
+            if not section_data:
                 self.__warnings.append(
                     'Invalid section {0}. No data in the file (is this corkami\'s virtsectblXP?).'.format(i))
                 break
@@ -3114,7 +3103,7 @@ def parse_resources_directory(self, rva, size=0, base_rva = None, level = 0, dir
             # Check if this entry contains version information
             #
             if level == 0 and res.Id == RESOURCE_TYPE['RT_VERSION']:
-                if len(dir_entries)>0:
+                if dir_entries:
                     last_entry = dir_entries[-1]
 
                 try:
@@ -5325,7 +5314,7 @@ def set_bytes_at_offset(self, offset, data):
         if not isinstance(data, bytes):
             raise TypeError('data should be of type: bytes')
 
-        if offset >= 0 and offset < len(self.__data__):
+        if 0 <= offset < len(self.__data__):
             self.__data__ = ( self.__data__[:offset] + data + self.__data__[offset+len(data):] )
         else:
             return False