From e6e58704dc99932700352cf0ef53081fa8baac68 Mon Sep 17 00:00:00 2001
From: shrlnm <mshkn@inbox.ru>
Date: Sun, 21 Aug 2022 09:08:05 +0300
Subject: [PATCH] fix tools

---
 pyren3/acf.py            |  4 +---
 pyren3/doc_maker.py      |  2 --
 pyren3/mod_acf_func.py   |  6 +++---
 pyren3/mod_acf_proc.py   | 15 ++++++++-------
 pyren3/mod_db_manager.py |  6 +++---
 5 files changed, 15 insertions(+), 18 deletions(-)
 mode change 100755 => 100644 pyren3/mod_acf_func.py
 mode change 100755 => 100644 pyren3/mod_acf_proc.py
 mode change 100755 => 100644 pyren3/mod_db_manager.py

diff --git a/pyren3/acf.py b/pyren3/acf.py
index 0124ce0..eaefdc7 100755
--- a/pyren3/acf.py
+++ b/pyren3/acf.py
@@ -71,9 +71,7 @@ def optParser():
   import argparse
 
   parser = argparse.ArgumentParser(
-    #usage = "%prog -p <port> [options]",
-    version="acfg Version 1.0",
-    description = "acfg - auto configuration tool"
+    description = "acf - auto configuration tool"
   )
   
   parser.add_argument('-p',
diff --git a/pyren3/doc_maker.py b/pyren3/doc_maker.py
index a39c2f7..8d495a6 100755
--- a/pyren3/doc_maker.py
+++ b/pyren3/doc_maker.py
@@ -646,8 +646,6 @@ def optParser():
   global allvin
 
   parser = argparse.ArgumentParser(
-    #usage = "%prog -p <port> [options]",
-    version="Document Viewer Version 1.0",
     description = "Tool for view DocDb"
   )
   
diff --git a/pyren3/mod_acf_func.py b/pyren3/mod_acf_func.py
old mode 100755
new mode 100644
index 2215e6d..e6d635e
--- a/pyren3/mod_acf_func.py
+++ b/pyren3/mod_acf_func.py
@@ -38,8 +38,8 @@ def acf_find_in_sirev( ref2, platform ):
   if len(list(errone.keys()))==0:
     se=zip.open('SIREV_ERRONE.dat')
     cont=se.read()
-    for l in cont.split('\n'):
-      li = l.split('/')
+    for l in cont.split(b'\n'):
+      li = l.split(b'/')
       if len(li)==6 and li[0]==platform:
         errone[li[2]] = li[3]
   
@@ -68,7 +68,7 @@ def acf_loadModules( de, refdata, platform ):
     print("Configuration database: ", acfFile)
     
   zip=zipfile.ZipFile(acfFile)
-  zip.setpassword('A710FBD006342FC8')
+  zip.setpassword(b'A710FBD006342FC8')
   zipflist = zip.namelist()
 
   module_list = []
diff --git a/pyren3/mod_acf_proc.py b/pyren3/mod_acf_proc.py
old mode 100755
new mode 100644
index d78ac74..c11cb30
--- a/pyren3/mod_acf_proc.py
+++ b/pyren3/mod_acf_proc.py
@@ -148,26 +148,27 @@ def acf_MTC_generateDefaults( m, mtc ):
   for k, v in sorted( list(m['acf_wc'].items()), key=lambda x_y: x_y[1] ):
     if mod_globals.opt_verbose or mod_globals.opt_verbose2:
       try:
-      	sf.write('#'*60 + '\n')
-      	sf.write('# ' + k + '\n')
+        sf.write('#'*60 + '\n')
+        sf.write('# ' + k + '\n')
       except:
-      	pass
+        pass
     if mod_globals.opt_verbose2:
       for di in sorted(list(m['mo'].req[k].SentDI.values()), key=lambda x: x.FirstByte * 8 + x.BitOffset):
         try:
           sf.write(pyren_encode('##     ' + di.Name + ' = ' + di.val + '\n'))
         except:
           try:
-          	sf.write(pyren_encode('##     ' + di.Name + ' = UNDEFINED\n'))
+            sf.write(pyren_encode('##     ' + di.Name + ' = UNDEFINED\n'))
           except:
-          	pass
+            pass
     sf.write(m['acf_wc'][k]+'\n')
 
 
   # write trailer
-  sf.write('\n# VIN programming\n')
+  sf.write('\n# VIN programming !!!check the command!!!\n')
   sf.write('#2EF190' + hex_VIN_plus_CRC(mod_globals.vin, False) +'\n')
-  sf.write('\n# reset ecu\n')
+  sf.write('#3B81' + hex_VIN_plus_CRC(mod_globals.vin, False) +'\n')
+  sf.write('\n# reset ecu or disconnect the battary!!!check the command!!!\n')
   sf.write('#1101\n\n')
   sf.write('exit\n')
 
diff --git a/pyren3/mod_db_manager.py b/pyren3/mod_db_manager.py
old mode 100755
new mode 100644
index 450c12c..d21bb49
--- a/pyren3/mod_db_manager.py
+++ b/pyren3/mod_db_manager.py
@@ -159,9 +159,9 @@ def get_file_from_clip( filename ):
         else: 
             encoding = 'utf-8'
         if mode=='rb':
-        	return open(os.path.join(mod_globals.cliproot, filename), mode)
+            return open(os.path.join(mod_globals.cliproot, filename), mode)
         else:
-        	return open(os.path.join(mod_globals.cliproot, filename), mode, encoding=encoding)
+            return open(os.path.join(mod_globals.cliproot, filename), mode, encoding=encoding)
     else:
         if filename.startswith('../'):
             filename = filename[3:]
@@ -228,7 +228,7 @@ def path_in_ddt( pattern ):
 
 def get_file_from_ddt( filename ):
     if mod_globals.ddt_arc=='':
-        return open(os.path.join(mod_globals.ddtroot, filename), 'r')
+        return open(os.path.join(mod_globals.ddtroot, filename), 'rb')
     else:
         return mod_globals.ddt_arc.open(filename, 'r')