<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[133045] contrib/pypi2port/pypi2port</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/133045">133045</a></dd>
<dt>Author</dt> <dd>mojca@macports.org</dd>
<dt>Date</dt> <dd>2015-02-18 15:06:14 -0800 (Wed, 18 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>pypi2port: use parenthesis for print arguments</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#contribpypi2portpypi2port">contrib/pypi2port/pypi2port</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="contribpypi2portpypi2port"></a>
<div class="modfile"><h4>Modified: contrib/pypi2port/pypi2port (133044 => 133045)</h4>
<pre class="diff"><span>
<span class="info">--- contrib/pypi2port/pypi2port 2015-02-18 21:16:02 UTC (rev 133044)
+++ contrib/pypi2port/pypi2port 2015-02-18 23:06:14 UTC (rev 133045)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> def list_all():
</span><span class="cx"> list_packages = client.list_packages()
</span><span class="cx"> for package in list_packages:
</span><del>- print package
</del><ins>+ print (package)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> """ Searches for a particular package by the name classifier """
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> values = client.search({'name': pkg_name})
</span><span class="cx"> for value in values:
</span><span class="cx"> for key in value.keys():
</span><del>- print key, '-->', value[key]
</del><ins>+ print (key, '-->', value[key])
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> """ Fetches the release data for a paticular package based on
</span><span class="lines">@@ -60,10 +60,10 @@
</span><span class="cx"> values = client.release_data(pkg_name, pkg_version)
</span><span class="cx"> if values:
</span><span class="cx"> for key in values.keys():
</span><del>- print key, '-->', values[key]
</del><ins>+ print (key, '-->', values[key])
</ins><span class="cx"> else:
</span><del>- print "No such package found."
- print "Please specify the exact package name."
</del><ins>+ print ("No such package found.")
+ print ("Please specify the exact package name.")
</ins><span class="cx"> return
</span><span class="cx"> return
</span><span class="cx">
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> def fetch(pkg_name, dict):
</span><del>- print "Fetching distfiles..."
</del><ins>+ print ("Fetching distfiles...")
</ins><span class="cx"> checksum_md5 = dict['md5_digest']
</span><span class="cx"> parent_dir = './sources'
</span><span class="cx"> home_dir = parent_dir + '/' + 'python'
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx">
</span><span class="cx"> checksum_md5_calc = hashlib.md5(open(file_name).read()).hexdigest()
</span><span class="cx"> if str(checksum_md5) == str(checksum_md5_calc):
</span><del>- print 'Successfully fetched'
</del><ins>+ print ('Successfully fetched')
</ins><span class="cx"> ext = file_name.split('.')[-1]
</span><span class="cx"> if ext == 'egg':
</span><span class="cx"> zip = zipfile.ZipFile(file_name)
</span><span class="lines">@@ -122,11 +122,11 @@
</span><span class="cx"> zip.extract(name, src_dir)
</span><span class="cx"> return file_name
</span><span class="cx"> else:
</span><del>- print 'Aborting due to inconsistency on checksums\n'
</del><ins>+ print ('Aborting due to inconsistency on checksums\n')
</ins><span class="cx"> try:
</span><span class="cx"> os.remove(file_name)
</span><del>- except OSError, e:
- print "Error: %s - %s." % (e.filename, e.strerror)
</del><ins>+ except (OSError, e):
+ print ("Error: {:s} - {:s}.".format(e.filename, e.strerror))
</ins><span class="cx"> return False
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -225,7 +225,7 @@
</span><span class="cx"> existing_portfile = \
</span><span class="cx"> subprocess.check_output(command, stderr=subprocess.STDOUT).strip()
</span><span class="cx"> return existing_portfile
</span><del>- except Exception, e:
</del><ins>+ except (Exception, e):
</ins><span class="cx"> return False
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -235,12 +235,12 @@
</span><span class="cx">
</span><span class="cx"> def checksums(pkg_name, pkg_version):
</span><span class="cx"> flag = False
</span><del>- print "Attempting to fetch distfiles..."
</del><ins>+ print ("Attempting to fetch distfiles...")
</ins><span class="cx"> file_name = fetch_url(pkg_name, pkg_version, True)
</span><span class="cx"> if file_name:
</span><span class="cx"> checksums = []
</span><span class="cx"> try:
</span><del>- print "Generating checksums..."
</del><ins>+ print ("Generating checksums...")
</ins><span class="cx"> command = "openssl rmd160 "+file_name
</span><span class="cx"> command = command.split()
</span><span class="cx"> rmd160 = subprocess.check_output(command, stderr=subprocess.STDOUT)
</span><span class="lines">@@ -263,7 +263,7 @@
</span><span class="cx"> pass
</span><span class="cx"> return checksums
</span><span class="cx"> except:
</span><del>- print "Error\n"
</del><ins>+ print ("Error\n")
</ins><span class="cx"> return
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -277,8 +277,8 @@
</span><span class="cx"> if not r.status_code == 200:
</span><span class="cx"> raise Error('No distfile')
</span><span class="cx"> except:
</span><del>- print "No distfile found"
- print "Please set a DISTFILE env var before generating the portfile"
</del><ins>+ print ("No distfile found")
+ print ("Please set a DISTFILE env var before generating the portfile")
</ins><span class="cx"> sys.exit(0)
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -316,14 +316,14 @@
</span><span class="cx">
</span><span class="cx"> for phase in [port_fetch, port_checksum, port_extract, port_configure,
</span><span class="cx"> port_build, port_destroot, port_clean]:
</span><del>- print phase.__name__
</del><ins>+ print (phase.__name__)
</ins><span class="cx"> phase_output = phase(name, portv)
</span><span class="cx"> if phase_output:
</span><del>- print phase.__name__ + " - SUCCESS"
</del><ins>+ print (phase.__name__ + " - SUCCESS")
</ins><span class="cx"> else:
</span><del>- print phase.__name__ + " FAILED"
</del><ins>+ print (phase.__name__ + " FAILED")
</ins><span class="cx"> port_clean(name, portv)
</span><del>- print "Exiting"
</del><ins>+ print ("Exiting")
</ins><span class="cx"> sys.exit(1)
</span><span class="cx">
</span><span class="cx"> euid = os.geteuid()
</span><span class="lines">@@ -450,7 +450,7 @@
</span><span class="cx">
</span><span class="cx"> def create_portfile(dict, file_name, dict2):
</span><span class="cx"> search_distfile(dict['name'], dict['version'])
</span><del>- print "Creating Portfile for pypi package " + dict['name'] + "..."
</del><ins>+ print ("Creating Portfile for pypi package " + dict['name'] + "...")
</ins><span class="cx"> with open(file_name, 'w') as file:
</span><span class="cx"> file.write('# -*- coding: utf-8; mode: tcl; tab-width: 4; ')
</span><span class="cx"> file.write('indent-tabs-mode: nil; c-basic-offset: 4 ')
</span><span class="lines">@@ -475,8 +475,8 @@
</span><span class="cx"> file.write('maintainers {0}\n\n'.format(
</span><span class="cx"> os.getenv('maintainer', 'nomaintainer')))
</span><span class="cx"> else:
</span><del>- print "No maintainers found..."
- print "Looking for maintainers in environment variables..."
</del><ins>+ print ("No maintainers found...")
+ print ("Looking for maintainers in environment variables...")
</ins><span class="cx"> file.write('maintainers {0}\n\n'.format(
</span><span class="cx"> os.getenv('maintainer', 'nomaintainer')))
</span><span class="cx">
</span><span class="lines">@@ -526,8 +526,8 @@
</span><span class="cx"> if home_page and not home_page == 'UNKNOWN':
</span><span class="cx"> file.write('homepage {0}\n'.format(home_page))
</span><span class="cx"> else:
</span><del>- print "No homepage found..."
- print "Looking for homepage in environment variables..."
</del><ins>+ print ("No homepage found...")
+ print ("Looking for homepage in environment variables...")
</ins><span class="cx"> file.write('homepage {0}\n'.format(
</span><span class="cx"> os.getenv('home_page', '')))
</span><span class="cx">
</span><span class="lines">@@ -560,8 +560,8 @@
</span><span class="cx"> master_site = dict['release_url']
</span><span class="cx"> # print master_site
</span><span class="cx"> else:
</span><del>- print "No master site found..."
- print "Looking for master site in environment variables..."
</del><ins>+ print ("No master site found...")
+ print ("Looking for master site in environment variables...")
</ins><span class="cx"> master_site = os.getenv('master_site', '')
</span><span class="cx"> if master_site:
</span><span class="cx"> file.write('master_sites {0}\n'.format(master_site))
</span><span class="lines">@@ -576,7 +576,7 @@
</span><span class="cx"> file.write('distname {0}-{1}\n\n'.format(
</span><span class="cx"> dict['name'], dict['version']))
</span><span class="cx">
</span><del>- print "Attempting to generate checksums for " + dict['name'] + "..."
</del><ins>+ print ("Attempting to generate checksums for " + dict['name'] + "...")
</ins><span class="cx"> checksums_values = checksums(dict['name'], dict['version'])
</span><span class="cx"> if checksums_values:
</span><span class="cx"> file.write('checksums rmd160 {0} \\\n'.format(
</span><span class="lines">@@ -591,7 +591,7 @@
</span><span class="cx"> else:
</span><span class="cx"> file.write('python.versions 25 26 27 32 33 34\n\n')
</span><span class="cx">
</span><del>- print "Finding dependencies..."
</del><ins>+ print ("Finding dependencies...")
</ins><span class="cx"> file.write('if {${name} ne ${subport}} {\n')
</span><span class="cx"> file.write(' depends_build-append \\\n')
</span><span class="cx"> file.write(' ' +
</span><span class="lines">@@ -639,22 +639,22 @@
</span><span class="cx"> file.write('}\n')
</span><span class="cx"> else:
</span><span class="cx"> file.write('}\n')
</span><del>- print "Searching for existent port..."
</del><ins>+ print ("Searching for existent port...")
</ins><span class="cx"> port_exists = search_port(dict['name'])
</span><span class="cx"> if port_exists:
</span><del>- print "Creating diff..."
</del><ins>+ print ("Creating diff...")
</ins><span class="cx"> old_file = port_exists
</span><span class="cx"> new_file = './dports/python/py-'+dict['name']+'/Portfile'
</span><span class="cx"> diff_file = './dports/python/py-'+dict['name']+'/patch.Portfile.diff'
</span><span class="cx"> create_diff(old_file, new_file, diff_file)
</span><del>- print str(os.path.abspath(diff_file))+"\n"
</del><ins>+ print (str(os.path.abspath(diff_file))+"\n")
</ins><span class="cx"> # with open(diff_file) as diff:
</span><span class="cx"> # print diff.read()
</span><del>- print "\nIf you want to open a new ticket. Please visit"
- print "https://trac.macports.org/auth/login/?next=/newticket"
- print "to open a new ticket after logging in with your credentials."
</del><ins>+ print ("\nIf you want to open a new ticket. Please visit")
+ print ("https://trac.macports.org/auth/login/?next=/newticket")
+ print ("to open a new ticket after logging in with your credentials.")
</ins><span class="cx"> else:
</span><del>- print "No port found."
</del><ins>+ print ("No port found.")
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> """ Creates the directories and other commands necessary
</span><span class="lines">@@ -678,22 +678,22 @@
</span><span class="cx"> if not os.path.exists(home_dir):
</span><span class="cx"> os.makedirs(home_dir)
</span><span class="cx">
</span><del>- print "Attempting to fetch data from pypi..."
</del><ins>+ print ("Attempting to fetch data from pypi...")
</ins><span class="cx">
</span><span class="cx"> dict = client.release_data(pkg_name, pkg_version)
</span><span class="cx"> dict2 = client.release_urls(pkg_name, pkg_version)
</span><span class="cx"> if dict and dict2:
</span><del>- print "Data fetched successfully."
</del><ins>+ print ("Data fetched successfully.")
</ins><span class="cx"> elif dict:
</span><del>- print "Release Data fetched successfully."
</del><ins>+ print ("Release Data fetched successfully.")
</ins><span class="cx"> elif dict2:
</span><del>- print "Release url fetched successfully."
</del><ins>+ print ("Release url fetched successfully.")
</ins><span class="cx"> else:
</span><del>- print "No data found."
</del><ins>+ print ("No data found.")
</ins><span class="cx">
</span><span class="cx"> file_name = os.path.join(home_dir, "Portfile")
</span><span class="cx"> create_portfile(dict, file_name, dict2)
</span><del>- print "SUCCESS\n"
</del><ins>+ print ("SUCCESS\n")
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> """ Main function - Argument Parser """
</span><span class="lines">@@ -748,7 +748,7 @@
</span><span class="cx"> pkg_version = client.package_releases(pkg_name)[0]
</span><span class="cx"> release_data(pkg_name, pkg_version)
</span><span class="cx"> else:
</span><del>- print "No release found\n"
</del><ins>+ print ("No release found\n")
</ins><span class="cx"> return
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -763,7 +763,7 @@
</span><span class="cx"> pkg_version = releases[0]
</span><span class="cx"> fetch_url(pkg_name, pkg_version)
</span><span class="cx"> else:
</span><del>- print "No release found\n"
</del><ins>+ print ("No release found\n")
</ins><span class="cx"> return
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -778,7 +778,7 @@
</span><span class="cx"> pkg_version = vers[0]
</span><span class="cx"> print_portfile(pkg_name, pkg_version)
</span><span class="cx"> else:
</span><del>- print "No release found\n"
</del><ins>+ print ("No release found\n")
</ins><span class="cx"> return
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -787,7 +787,7 @@
</span><span class="cx"> pkg_name = options.package_test[0]
</span><span class="cx"> port_testing(pkg_name)
</span><span class="cx"> else:
</span><del>- print "No package name specified\n"
</del><ins>+ print ("No package name specified\n")
</ins><span class="cx"> return
</span><span class="cx">
</span><span class="cx"> parser.print_help()
</span></span></pre>
</div>
</div>
</body>
</html>