<html><head><meta http-equiv="Content-Type" content="text/html charset=us-ascii"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;"><div>With this change, an failure importing <i>either</i> xmlrpclib or urllib2.urlopen will result in the fallback behavior for <i>both</i>. You should use two separate try blocks.</div><div><br></div><div>vq</div><div><br></div><br><div><div>On Sep 22, 2014, at 3:53 PM, <a href="mailto:g5pw@macports.org">g5pw@macports.org</a> wrote:</div><br class="Apple-interchange-newline"><blockquote type="cite"><div style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px;"><div id="msg"><dl class="meta" style="font-family: verdana, arial, helvetica, sans-serif; font-size: 10pt; border: 1px solid rgb(0, 0, 102); background-color: rgb(51, 102, 153); padding: 6px; color: rgb(255, 255, 255); background-position: initial initial; background-repeat: initial initial;"><dt style="font-family: verdana, arial, helvetica, sans-serif; font-size: 10pt; float: left; width: 6em; font-weight: bold;">Revision</dt><dd><a href="https://trac.macports.org/changeset/125609" style="font-weight: bold; color: rgb(204, 204, 102);">125609</a></dd><dt style="font-family: verdana, arial, helvetica, sans-serif; font-size: 10pt; float: left; width: 6em; font-weight: bold;">Author</dt><dd><a href="mailto:g5pw@macports.org" style="font-weight: bold; color: rgb(204, 204, 102);">g5pw@macports.org</a></dd><dt style="font-family: verdana, arial, helvetica, sans-serif; font-size: 10pt; float: left; width: 6em; font-weight: bold;">Date</dt><dd>2014-09-22 12:53:16 -0700 (Mon, 22 Sep 2014)</dd></dl><h3 style="font-family: verdana, arial, helvetica, sans-serif; font-size: 10pt; font-weight: bold;">Log Message</h3><pre style="overflow: auto; background-color: rgb(255, 255, 204); border: 1px solid rgb(255, 170, 0); padding: 6px; background-position: initial initial; background-repeat: initial initial;">Conditionally import urllib
This should work for python3, too, although it is untested because of a missing
dependency.</pre><h3 style="font-family: verdana, arial, helvetica, sans-serif; font-size: 10pt; font-weight: bold;">Modified Paths</h3><ul style="font-family: verdana, arial, helvetica, sans-serif; font-size: 10pt;"><li style="font-family: verdana, arial, helvetica, sans-serif; font-size: 10pt;"><a href="x-msg://131/#usersg5pwpypi2portpypi2portpy">users/g5pw/pypi2port/pypi2port.py</a></li></ul></div><div id="patch" style="width: 609px;"><h3 style="font-family: verdana, arial, helvetica, sans-serif; font-size: 10pt; font-weight: bold;">Diff</h3><a id="usersg5pwpypi2portpypi2portpy"></a><div class="modfile" style="border: 1px solid rgb(204, 204, 204); margin: 10px 0px;"><h4 style="font-family: verdana, arial, helvetica, sans-serif; font-size: 10pt; padding: 8px; background-color: rgb(51, 102, 153); color: rgb(255, 255, 255); margin: 0px; background-position: initial initial; background-repeat: initial initial;">Modified: users/g5pw/pypi2port/pypi2port.py (125608 => 125609)</h4><pre class="diff" style="padding: 0px 0px 10px; line-height: 1.2em; margin: 0px; width: 607px; background-color: rgb(238, 238, 238); overflow: auto; background-position: initial initial; background-repeat: initial initial;"><span style="display: block; padding: 0px 10px;">
<span class="info" style="color: rgb(136, 136, 136); background-color: rgb(255, 255, 255); display: block; padding: 0px 10px; background-position: initial initial; background-repeat: initial initial;">--- users/g5pw/pypi2port/pypi2port.py 2014-09-22 19:53:11 UTC (rev 125608)
+++ users/g5pw/pypi2port/pypi2port.py 2014-09-22 19:53:16 UTC (rev 125609)
</span><span class="lines" style="display: block; padding: 0px 10px; color: rgb(136, 136, 136); background-color: rgb(255, 255, 255); background-position: initial initial; background-repeat: initial initial;">@@ -11,14 +11,15 @@
</span><span class="cx" style="display: block; padding: 0px 10px;"> import argparse
</span><span class="cx" style="display: block; padding: 0px 10px;"> import sys
</span><span class="cx" style="display: block; padding: 0px 10px;"> import os
</span><del style="background-color: rgb(255, 221, 221); text-decoration: none; display: block; padding: 0px 10px; background-position: initial initial; background-repeat: initial initial;">-import urllib2
</del><span class="cx" style="display: block; padding: 0px 10px;"> import hashlib
</span><span class="cx" style="display: block; padding: 0px 10px;"> import zipfile
</span><span class="cx" style="display: block; padding: 0px 10px;"> import progressbar as pb
</span><span class="cx" style="display: block; padding: 0px 10px;"> try:
</span><span class="cx" style="display: block; padding: 0px 10px;"> import xmlrpclib
</span><ins style="background-color: rgb(221, 255, 221); text-decoration: none; display: block; padding: 0px 10px; background-position: initial initial; background-repeat: initial initial;">+ from urllib2 import urlopen
</ins><span class="cx" style="display: block; padding: 0px 10px;"> except ImportError:
</span><span class="cx" style="display: block; padding: 0px 10px;"> import xmlrpc.client as xmlrpclib
</span><ins style="background-color: rgb(221, 255, 221); text-decoration: none; display: block; padding: 0px 10px; background-position: initial initial; background-repeat: initial initial;">+ from urllib.request import urlopen
</ins><span class="cx" style="display: block; padding: 0px 10px;"> import textwrap
</span><span class="cx" style="display: block; padding: 0px 10px;"> import string
</span><span class="cx" style="display: block; padding: 0px 10px;"> import shutil
</span><span class="lines" style="display: block; padding: 0px 10px; color: rgb(136, 136, 136); background-color: rgb(255, 255, 255); background-position: initial initial; background-repeat: initial initial;">@@ -77,7 +78,7 @@
</span><span class="cx" style="display: block; padding: 0px 10px;"> url = dict['url']
</span><span class="cx" style="display: block; padding: 0px 10px;"> file_name = src_dir + '/' + dict['filename']
</span><span class="cx" style="display: block; padding: 0px 10px;">
</span><del style="background-color: rgb(255, 221, 221); text-decoration: none; display: block; padding: 0px 10px; background-position: initial initial; background-repeat: initial initial;">- u = urllib2.urlopen(url)
</del><ins style="background-color: rgb(221, 255, 221); text-decoration: none; display: block; padding: 0px 10px; background-position: initial initial; background-repeat: initial initial;">+ u = urlopen(url)
</ins><span class="cx" style="display: block; padding: 0px 10px;"> with open(file_name, 'wb') as f:
</span><span class="cx" style="display: block; padding: 0px 10px;"> meta = u.info()
</span><span class="cx" style="display: block; padding: 0px 10px;"> file_size = int(meta.getheaders("Content-Length")[0])
</span></span></pre></div></div>_______________________________________________<br>macports-changes mailing list<br><a href="mailto:macports-changes@lists.macosforge.org">macports-changes@lists.macosforge.org</a><br><a href="https://lists.macosforge.org/mailman/listinfo/macports-changes">https://lists.macosforge.org/mailman/listinfo/macports-changes</a></div></blockquote></div><br></body></html>