Commit 8c019d80 authored by Jérome Perrin's avatar Jérome Perrin

TemplateTool: py3

parent 8b41be53
...@@ -345,7 +345,9 @@ class TemplateTool (BaseTool): ...@@ -345,7 +345,9 @@ class TemplateTool (BaseTool):
try: try:
os.close(tempid) # Close the opened fd as soon as possible. os.close(tempid) # Close the opened fd as soon as possible.
file_path, headers = urlretrieve(url, temppath) file_path, headers = urlretrieve(url, temppath)
if re.search(r'<title>.*Revision \d+:', open(file_path, 'r').read()): with open(file_path, 'rb') as f:
content = f.read()
if re.search(br'<title>.*Revision \d+:', content):
# this looks like a subversion repository, try to check it out # this looks like a subversion repository, try to check it out
LOG('ERP5', INFO, 'TemplateTool doing a svn checkout of %s' % url) LOG('ERP5', INFO, 'TemplateTool doing a svn checkout of %s' % url)
return self._download_svn(url, bt_id) return self._download_svn(url, bt_id)
...@@ -703,7 +705,7 @@ class TemplateTool (BaseTool): ...@@ -703,7 +705,7 @@ class TemplateTool (BaseTool):
""" """
Get the list of repositories. Get the list of repositories.
""" """
return self.repository_dict.keys() return list(self.repository_dict.keys())
security.declarePublic( 'decodeRepositoryBusinessTemplateUid' ) security.declarePublic( 'decodeRepositoryBusinessTemplateUid' )
def decodeRepositoryBusinessTemplateUid(self, uid): def decodeRepositoryBusinessTemplateUid(self, uid):
...@@ -1113,7 +1115,7 @@ class TemplateTool (BaseTool): ...@@ -1113,7 +1115,7 @@ class TemplateTool (BaseTool):
e = int(e) e = int(e)
except ValueError: except ValueError:
# ASCII code is one byte, so this produces negative. # ASCII code is one byte, so this produces negative.
e = struct.unpack('b', e)[0] - 0x200 e = struct.unpack('b', e.encode())[0] - 0x200
except IndexError: except IndexError:
e = 0 e = 0
return e return e
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment