Merge pull request #110 from SummerGGift/for_python3

【更新】 python3

Author: armink

.gitignore

@@ -99,3 +99,6 @@ ENV/
 
 # mypy
 .mypy_cache/
+.vscode/settings.json
+cmds/.config.old
+/cmds/.config

archive.py

@@ -103,7 +103,8 @@ def unpack(archive_fn, path, pkg, pkgs_name_in_json):
 
 def packtest(path):
     ret = True
-    if ".zip" in path:
+
+    if path.find(".zip") != -1:
         try:
             if zipfile.is_zipfile(path):
                 # Test zip again to make sure it's a right zip file.
@@ -114,24 +115,26 @@ def packtest(path):
             else:
                 ret = False
                 print('package check error. \n')
-        except Exception, e:
-            print('packtest e.message:%s\t' % e.message)
-#             arch.close()
+        except Exception as e:
+            print('packtest error message:%s\t' % e)
             print("The archive package is broken. \n")
+            arch.close()
             ret = False
 
-    if ".tar.bz2" in path:
+    # if ".tar.bz2" in path:.
+    if path.find(".tar.bz2") != -1:
         try:
             if not tarfile.is_tarfile(path):
                 ret = False
-        except Exception, e:
+        except Exception as e:
             ret = False
 
-    if ".tar.gz" in path:
+    # if ".tar.gz" in path:
+    if path.find(".tar.gz") != -1:
         try:
             if not tarfile.is_tarfile(path):
                 ret = False
-        except Exception, e:
+        except Exception as e:
             ret = False
 
     return ret

cmds/cmd_menuconfig.py

@@ -101,9 +101,9 @@ def mk_rtconfig(filename):
 
 def find_macro_in_config(filename, macro_name):
     try:
-        config = file(filename)
+        config = open(filename, "r")
     except:
-        print 'open .config failed'
+        print('open .config failed')
         return
 
     empty_line = 1
@@ -141,6 +141,7 @@ def find_macro_in_config(filename, macro_name):
                     if setting[0] == macro_name and setting[1] == 'y':
                         return True
 
+    config.close()
     return False
 
 
@@ -178,7 +179,7 @@ def cmd(args):
         os.system('chcp 437  > nul')
 
     if args.menuconfig_fn:
-        print 'use', args.menuconfig_fn
+        print('use', args.menuconfig_fn)
         import shutil
         shutil.copy(args.menuconfig_fn, fn)
     elif args.menuconfig_g:
@@ -236,18 +237,18 @@ def cmd(args):
 
         if find_macro_in_config(fn, 'SYS_AUTO_UPDATE_PKGS'):
             os.system('pkgs --update')
-            print "==============================>The packages have been updated completely."
+            print("==============================>The packages have been updated completely.")
 
         if find_macro_in_config(fn, 'SYS_CREATE_MDK_IAR_PROJECT'):
             if find_macro_in_config(fn, 'SYS_CREATE_MDK4'):
                 os.system('scons --target=mdk4 -s')
-                print "Create mdk4 project done"
+                print("Create mdk4 project done") 
             elif find_macro_in_config(fn, 'SYS_CREATE_MDK5'):
                 os.system('scons --target=mdk5 -s')
-                print "Create mdk5 project done"
+                print("Create mdk5 project done") 
             elif find_macro_in_config(fn, 'SYS_CREATE_IAR'):
                 os.system('scons --target=iar -s')
-                print "Create iar project done"
+                print("Create iar project done") 
 
 
 def add_parser(sub):