I2P_Developers/i2p.newsxml
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Start working on updating it to python 3

Browse Source
This commit is contained in:
idk
2021-05-08 00:10:04 -04:00
parent aff7453ede
commit 0e096f0b2c
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
feedgen/ext/i2p.py
View File

@ -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

16
generate_news.py
View File

@ -27,7 +27,7 @@ def load_feed_metadata(fg):
def load_entries(fg, entries_file):
with open(entries_file) as f:
entries_data = f.read().decode('utf8').strip('\n')
entries_data = f.read().strip('\n')
# Replace HTML non-breaking space with unicode
entries_data = entries_data.replace(' ', u'\u00a0')
# Strip the leading <div> from translations
@ -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)