changeset 715aa908e037 in trydevpi.tryton.org:default
details:
https://hg.tryton.org/trydevpi.tryton.org?cmd=changeset;node=715aa908e037
description:
Add support to Python3
diffstat:
trydevpi.py | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diffs (63 lines):
diff -r 8928141cc2fc -r 715aa908e037 trydevpi.py
--- a/trydevpi.py Tue Jul 14 09:20:34 2020 +0200
+++ b/trydevpi.py Sun Sep 27 15:02:10 2020 +0200
@@ -1,6 +1,7 @@
from flask import Flask, render_template, request
from flask_caching import Cache
from mercurial import ui, hg
+from mercurial.encoding import unitolocal, unifromlocal
from mercurial.hgweb.hgwebdir_mod import findrepos
BASE_URL = {
@@ -26,21 +27,23 @@
def get_urls(branch_filter=None, mirror=None):
urls = {}
lui = ui.ui()
- lui.readconfig(app.config['HG_CONFIG'], trust=True)
- paths = lui.configitems('paths')
+ lui.readconfig(unitolocal(app.config['HG_CONFIG']), trust=True)
+ paths = lui.configitems(b'paths')
new_packages = []
- last_series = None
+ last_series = ()
+ if branch_filter:
+ branch_filter = unitolocal(branch_filter)
for name, path in findrepos(paths):
- if (name not in ('trytond', 'proteus', 'tryton')
- and not name.startswith('modules/')):
+ if (name not in (b'trytond', b'proteus', b'tryton')
+ and not name.startswith(b'modules/')):
continue
- package = get_package(name)
+ package = get_package(unifromlocal(name))
repo = hg.repository(lui, path)
last_major = {}
max_version = (-1, -1)
for version in repo.tags():
try:
- major, minor, bug = map(int, version.split('.'))
+ major, minor, bug = map(int, version.split(b'.'))
except ValueError:
continue
key = (major, minor)
@@ -52,7 +55,7 @@
new_packages.append(package)
continue
last_major[max_version[0], max_version[1] + 1] = -1
- for (major, minor), bug in last_major.iteritems():
+ for (major, minor), bug in last_major.items():
bug += 1
version = get_version(major, minor, bug)
last_series = max(last_series, (major, minor, bug))
@@ -91,9 +94,9 @@
def get_branch(major, minor, mirror=None):
if minor % 2:
- return DEFAULT_BRANCH.get(mirror, 'default')
+ return unitolocal(DEFAULT_BRANCH.get(mirror, 'default'))
else:
- return '%s.%s' % (major, minor)
+ return unitolocal('%s.%s' % (major, minor))
def get_url(name, branch, version, mirror=None):
