<pre style='margin:0'>
Zero King (l2dy) pushed a commit to branch master
in repository macports-contrib.
</pre>
<p><a href="https://github.com/macports/macports-contrib/commit/271452fdcb7f824170d37263d0552182d1ff9074">https://github.com/macports/macports-contrib/commit/271452fdcb7f824170d37263d0552182d1ff9074</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 271452f pypi2port: Update XML-RPC URL, drop MD5
</span>271452f is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 271452fdcb7f824170d37263d0552182d1ff9074
</span>Author: Zero King <l2dy@macports.org>
AuthorDate: Fri May 11 01:22:48 2018 +0000
<span style='display:block; white-space:pre;color:#404040;'> pypi2port: Update XML-RPC URL, drop MD5
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://github.com/pypa/warehouse/blob/b321bc141d09da37100e030ba7e3f8e152689767/docs/api-reference/xml-rpc.rst
</span>---
pypi2port/pypi2port.py | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/pypi2port/pypi2port.py b/pypi2port/pypi2port.py
</span><span style='display:block; white-space:pre;color:#808080;'>index 1bfc79b..1e436b9 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/pypi2port/pypi2port.py
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/pypi2port/pypi2port.py
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,7 +39,7 @@ import subprocess
</span> import time
<span style='display:block; white-space:pre;background:#ffe0e0;'>-client = xmlrpclib.ServerProxy('https://pypi.python.org/pypi')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+client = xmlrpclib.ServerProxy('https://pypi.org/pypi')
</span>
def list_all():
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -104,7 +104,7 @@ def release_data(pkg_name, pkg_version):
</span> def fetch(pkg_name, dict):
""" Fetches the distfile for a particular package name and release_url """
print("Fetching distfiles...")
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksum_md5 = dict['md5_digest']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksum_sha256 = dict['sha256_digest']
</span> parent_dir = './sources'
home_dir = parent_dir + '/' + 'python'
src_dir = home_dir + '/py-' + pkg_name
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -172,9 +172,9 @@ def fetch(pkg_name, dict):
</span> sys.stdout.write(" OK\n")
sys.stdout.flush()
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksum_md5_calc = hashlib.md5(open(file_name,'rb').read()).hexdigest()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksum_sha256_calc = hashlib.sha256(open(file_name,'rb').read()).hexdigest()
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if str(checksum_md5) == str(checksum_md5_calc):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if str(checksum_sha256) == str(checksum_sha256_calc):
</span> print('Successfully fetched')
ext = file_name.split('.')[-1]
if ext == 'egg':
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -184,7 +184,7 @@ def fetch(pkg_name, dict):
</span> zip.extract(name, src_dir)
return file_name
else:
<span style='display:block; white-space:pre;background:#ffe0e0;'>- print('Aborting due to inconsistency on checksums (expected {0} != downloaded {1})\n'.format(checksum_md5, checksum_md5_calc))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ print('Aborting due to inconsistency on checksums (expected {0} != downloaded {1})\n'.format(checksum_sha256, checksum_sha256_calc))
</span> try:
os.remove(file_name)
except OSError as e:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -289,7 +289,7 @@ def checksums(pkg_name, pkg_version):
</span> try:
print("Generating checksums...")
<span style='display:block; white-space:pre;background:#ffe0e0;'>- for chk in ['md5', 'rmd160', 'sha256']:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for chk in ['rmd160', 'sha256']:
</span> command = "openssl " + chk + " " + file_name
command = command.split()
val = str(subprocess.check_output(command, stderr=subprocess.STDOUT))
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -585,8 +585,7 @@ def create_portfile(dict, file_name, dict2):
</span> file.write('{0: <6} {1}'.format(chk, checksums_values[chk]))
file.write('\n\n')
else:
<span style='display:block; white-space:pre;background:#ffe0e0;'>- file.write('checksums md5 XXX \\\n')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file.write(' rmd160 XXX \\\n')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file.write('checksums rmd160 XXX \\\n')
</span> file.write(' sha256 XXX \\\n')
file.write(' size XXX\n\n')
</pre><pre style='margin:0'>
</pre>