diff options
| author | Yonghong Zhu <yonghong.zhu@intel.com> | 2018-09-04 10:39:47 +0800 |
|---|---|---|
| committer | Yonghong Zhu <yonghong.zhu@intel.com> | 2018-10-13 09:57:16 +0800 |
| commit | 1b2e077260030290c512f3ac71a044ed1150899f (patch) | |
| tree | 4834e04cda1ed358ce20dd24906af28665907e8c /BaseTools/Source/Python/UPT/Core | |
| parent | 9d7e1e56a727743a811abfed92e1ede39ecbfa8c (diff) | |
| download | edk2-1b2e077260030290c512f3ac71a044ed1150899f.tar.gz edk2-1b2e077260030290c512f3ac71a044ed1150899f.tar.bz2 edk2-1b2e077260030290c512f3ac71a044ed1150899f.zip | |
BaseTools/UPT: Porting UPT Tool from Python2 to Python3
Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
Diffstat (limited to 'BaseTools/Source/Python/UPT/Core')
| -rw-r--r-- | BaseTools/Source/Python/UPT/Core/FileHook.py | 2 | ||||
| -rw-r--r-- | BaseTools/Source/Python/UPT/Core/IpiDb.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/BaseTools/Source/Python/UPT/Core/FileHook.py b/BaseTools/Source/Python/UPT/Core/FileHook.py index ceae12fb37..247dc4bd34 100644 --- a/BaseTools/Source/Python/UPT/Core/FileHook.py +++ b/BaseTools/Source/Python/UPT/Core/FileHook.py @@ -66,7 +66,7 @@ class RecoverMgr: arc = self._tryhook(path)
if arc and os.path.isfile(path):
self._createzip()
- self.zip.write(path, arc.encode('utf_8'))
+ self.zip.write(path, arc)
sta = os.stat(path)
oldmode = stat.S_IMODE(sta.st_mode)
self.rlist.append(_PathInfo(_CHMOD, path, oldmode))
diff --git a/BaseTools/Source/Python/UPT/Core/IpiDb.py b/BaseTools/Source/Python/UPT/Core/IpiDb.py index a781d358c8..6c85c9756c 100644 --- a/BaseTools/Source/Python/UPT/Core/IpiDb.py +++ b/BaseTools/Source/Python/UPT/Core/IpiDb.py @@ -44,7 +44,7 @@ class IpiDatabase(object): Dir = os.path.dirname(DbPath)
if not os.path.isdir(Dir):
os.mkdir(Dir)
- self.Conn = sqlite3.connect(unicode(DbPath), isolation_level='DEFERRED')
+ self.Conn = sqlite3.connect(DbPath, isolation_level='DEFERRED')
self.Conn.execute("PRAGMA page_size=4096")
self.Conn.execute("PRAGMA synchronous=OFF")
self.Cur = self.Conn.cursor()
|