Merge pull request ywangd#403 from onyxware/dev

Fix encoding error for executing setup.py

Author: bennr01

bin/crypt.py

@@ -74,8 +74,8 @@ def aes_decrypt(self, key, chunksize=64 * 1024):
     args = ap.parse_args()
     crypt = Crypt(args.infile, args.outfile)
     if args.decrypt:
-        crypt.aes_decrypt(args.key)
+        crypt.aes_decrypt(args.key.encode())
     else:
         nk = crypt.aes_encrypt(args.key)
         if args.key is None:
-            print("Key: %s" % nk)
+            print("Key: %s" % nk.decode())

bin/pip.py

@@ -780,9 +780,12 @@ def _get_cooked_ast(filename):
         """
         # with codecs.open(filename, mode="r", encoding="UTF-8") as ins:
         #    s = ins.read()
-        with open(filename, "r") as ins:
-            s = ins.read()
-        tree = ast.parse(s, filename=filename, mode='exec')
+        with open(filename, "rb") as ins:
+            tree = ast.parse(
+                ins.read(),
+                filename=filename,
+                mode='exec'
+            )
         ArchiveFileInstaller.SetupTransformer().visit(tree)
         return tree