From e0d7635700a14cf574be742122204c56d1589ee4 Mon Sep 17 00:00:00 2001 From: idk Date: Sat, 4 Sep 2021 14:12:26 -0400 Subject: [PATCH] Make it ready to work with python3 with zlatinb's help --- .dockerignore | 1 + etc/reqs.txt | 2 +- feedgen/ext/i2p.py | 8 ++++---- generate_news.py | 16 ++++++++-------- setup.py | 2 +- setup_venv.sh | 2 +- 6 files changed, 16 insertions(+), 15 deletions(-) create mode 100644 .dockerignore diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..8fa5b33 --- /dev/null +++ b/.dockerignore @@ -0,0 +1 @@ +env \ No newline at end of file diff --git a/etc/reqs.txt b/etc/reqs.txt index 43c65f9..c2dfb1a 100644 --- a/etc/reqs.txt +++ b/etc/reqs.txt @@ -1 +1 @@ -feedgen==0.3.1 +feedgen>=0.3.1 diff --git a/feedgen/ext/i2p.py b/feedgen/ext/i2p.py index 39c8bf6..d40644e 100644 --- a/feedgen/ext/i2p.py +++ b/feedgen/ext/i2p.py @@ -69,7 +69,7 @@ class Release(object): if self.__release_min_java_version is not None: release.attrib['minJavaVersion'] = self.__release_min_java_version - for update_type, update in self.__release_updates.iteritems(): + for update_type, update in self.__release_updates.items(): update_node = etree.SubElement(release, '{%s}update' % I2P_NS) update_node.attrib['type'] = update_type @@ -116,7 +116,7 @@ class Release(object): raise ValueError('update_type must be one of sud, su2 or su3') if update is None: update = Update() - if self.__release_updates.has_key(update_type) and not replace: + if update_type in self.__release_updates and not replace: raise ValueError('Update type %s is already defined' % update_type) self.__release_updates[update_type] = update return update @@ -159,7 +159,7 @@ class Revocations(object): revocations = etree.Element('{%s}revocations' % I2P_NS) - for crl_id, crl in self.__revocations_crls.iteritems(): + for crl_id, crl in self.__revocations_crls.items(): crl_node = etree.SubElement(revocations, '{%s}crl' % I2P_NS) crl_node.attrib['id'] = crl_id crl_node.attrib['updated'] = crl.updated().isoformat() @@ -170,7 +170,7 @@ class Revocations(object): def add_crl(self, crl_id, crl=None, replace=False): if crl is None: crl = Crl() - if self.__revocations_crls.has_key(crl_id) and not replace: + if crl_id in self.__revocations_crls and not replace: raise ValueError('CRL ID %s is already defined' % crl_id) self.__revocations_crls[crl_id] = crl return crl diff --git a/generate_news.py b/generate_news.py index a646cab..7035bd5 100755 --- a/generate_news.py +++ b/generate_news.py @@ -29,7 +29,7 @@ def load_entries(fg, entries_file): with open(entries_file) as f: entries_data = f.read().decode('utf8').strip('\n') # Replace HTML non-breaking space with unicode - entries_data = entries_data.replace(' ', u'\u00a0') + entries_data = entries_data.replace(' ', '\u00a0') # Strip the leading
from translations if entries_data.startswith('
'): entries_data = entries_data[5:] @@ -66,22 +66,22 @@ def load_releases(fg): r = fg.i2p.add_release() r.date(release['date']) r.version(release['version']) - if release.has_key('minVersion'): + if 'minVersion' in release: r.min_version(release['minVersion']) - if release.has_key('minJavaVersion'): + if 'minJavaVersion' in release: r.min_java_version(release['minJavaVersion']) - for update_type, update in release['updates'].iteritems(): + for update_type, update in release['updates'].items(): u = r.add_update(update_type) - if update.has_key('clearnet'): + if 'clearnet' in update: for url in update['clearnet']: u.clearnet(url) - if update.has_key('clearnetssl'): + if 'clearnetssl' in update: for url in update['clearnetssl']: u.clearnetssl(url) - if update.has_key('torrent'): + if 'torrent' in update: u.torrent(update['torrent']) - if update.has_key('url'): + if 'url' in update: for url in update['url']: u.url(url) diff --git a/setup.py b/setup.py index 9fa8f44..95b57de 100644 --- a/setup.py +++ b/setup.py @@ -9,6 +9,6 @@ setup( description='I2P Atom extension for feedgen', author='str4d', - install_requires="feedgen==0.3.1", + install_requires="feedgen>=0.3.1", packages=['feedgen.ext'], ) diff --git a/setup_venv.sh b/setup_venv.sh index 6897245..36b7b14 100755 --- a/setup_venv.sh +++ b/setup_venv.sh @@ -7,7 +7,7 @@ if [ ! $venv ]; then exit 1 else if [ ! -d $venv_dir ] ; then - if $venv --version | grep '[2-9][0-9].0.*'; then + if $venv --version | awk -F: '{if($2>20)print$2}' ; then $venv $venv_dir else $venv --distribute $venv_dir