Merge pull request pyinstaller#2025 from stephenrauch/pefile_py3_setu…

…p_workaround

Work around for pyinstaller#2019

.pylintrc

@@ -1,7 +1,7 @@
 [MASTER]
 # Add files or directories to the blacklist. They should be base names, not
 # paths.
-ignore=CVS,altgraph,macholib,pefile.py,six.py,unittest2,pefile_py2.py,pefile_py3.py,ordlookup,modulegraph
+ignore=CVS,altgraph,macholib,pefile.py,six.py,unittest2,ordlookup,modulegraph
 [BASIC]
 # Good variable names which should always be accepted, separated by a comma
 good-names=i,j,k,ex,Run,_,hiddenimports,binaries,datas,excludedimports

PyInstaller/depend/bindepend.py

@@ -182,7 +182,8 @@ def matchDLLArch(filename):
     if not is_win:
         return True
 
-    import pefile
+    # ::TODO:: #1920 revert to using pypi version
+    from ..lib import pefile
 
     global _exe_machine_type
     if _exe_machine_type is None:

PyInstaller/lib/ordlookup/__init__.py

@@ -1,5 +1,6 @@
-from .ws2_32 import *
-from .oleaut32 import *
+from __future__ import absolute_import
+from . import ws2_32
+from . import oleaut32
 
 '''
 A small module for keeping a database of ordinal to symbol
@@ -8,9 +9,9 @@
 '''
 
 ords = {
-    'ws2_32.dll':ws2_32.ord_names,
-    'wsock32.dll':ws2_32.ord_names,
-    'oleaut32.dll':oleaut32.ord_names,
+    b'ws2_32.dll':ws2_32.ord_names,
+    b'wsock32.dll':ws2_32.ord_names,
+    b'oleaut32.dll':oleaut32.ord_names,
 }
 
 def ordLookup(libname, ord, make_name=False):
@@ -28,4 +29,3 @@ def ordLookup(libname, ord, make_name=False):
         return 'ord%d' % ord
     return name
 
-