<!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>[123702] branches/gsoc14-pip2port/pypi2port.py</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/123702">123702</a></dd>
<dt>Author</dt> <dd>gaurav@macports.org</dd>
<dt>Date</dt> <dd>2014-08-13 01:54:17 -0700 (Wed, 13 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Updated script as per pep8 and removed shell=True from subprocess commands because of it being a security hazard</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesgsoc14pip2portpypi2portpy">branches/gsoc14-pip2port/pypi2port.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesgsoc14pip2portpypi2portpy"></a>
<div class="modfile"><h4>Modified: branches/gsoc14-pip2port/pypi2port.py (123701 => 123702)</h4>
<pre class="diff"><span>
<span class="info">--- branches/gsoc14-pip2port/pypi2port.py 2014-08-13 08:28:43 UTC (rev 123701)
+++ branches/gsoc14-pip2port/pypi2port.py 2014-08-13 08:54:17 UTC (rev 123702)
</span><span class="lines">@@ -2,7 +2,8 @@
</span><span class="cx"> """:"
</span><span class="cx"> exec python $0 ${1+"$@"}
</span><span class="cx"> """
</span><del>-__doc__ = """...Tester Script for pypi2port..."""
</del><ins>+__doc__ = """...Script for pypi2port module written for "The Macports Project"
+ participating in Google Summer of Code 2014..."""
</ins><span class="cx">
</span><span class="cx"> # -*- coding: utf-8 -*-
</span><span class="cx"> # !/usr/bin/env python
</span><span class="lines">@@ -137,8 +138,8 @@
</span><span class="cx"> if not value['filename'].split('.')[-1] == 'gz':
</span><span class="cx"> fetch(pkg_name, value)
</span><span class="cx"> try:
</span><del>-# print "Finding dependencies..."
- with open('./sources/python/py-' + pkg_name + '/EGG-INFO/requires.txt') as f:
</del><ins>+ with open('./sources/python/py-'
+ + pkg_name + '/EGG-INFO/requires.txt') as f:
</ins><span class="cx"> list = f.readlines()
</span><span class="cx"> list = [x.strip('\n') for x in list]
</span><span class="cx"> f.close()
</span><span class="lines">@@ -149,7 +150,8 @@
</span><span class="cx"> items = os.listdir('./sources/python/py-' + pkg_name)
</span><span class="cx"> for item in items[:]:
</span><span class="cx"> if not item.split('.')[-1] == 'gz':
</span><del>- os.remove('./sources/python/py-' + pkg_name + '/' + item)
</del><ins>+ os.remove('./sources/python/py-'
+ + pkg_name + '/' + item)
</ins><span class="cx"> items.remove(item)
</span><span class="cx"> if not items:
</span><span class="cx"> os.rmdir('./sources/python/py-' + pkg_name)
</span><span class="lines">@@ -172,10 +174,11 @@
</span><span class="cx"> pass
</span><span class="cx"> return False
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def create_diff(old_file, new_file, diff_file):
</span><span class="cx"> a = open(old_file).readlines()
</span><span class="cx"> b = open(new_file).readlines()
</span><del>- diff_string = difflib.unified_diff(a,b,"Portfile.orig","Portfile")
</del><ins>+ diff_string = difflib.unified_diff(a, b, "Portfile.orig", "Portfile")
</ins><span class="cx"> with open(diff_file, 'w') as d:
</span><span class="cx"> try:
</span><span class="cx"> while 1:
</span><span class="lines">@@ -187,30 +190,33 @@
</span><span class="cx"> def search_port(name):
</span><span class="cx"> try:
</span><span class="cx"> command = "port file name:^py-" + name + "$"
</span><del>- existing_portfile = subprocess.check_output(command, shell=True, stderr=subprocess.STDOUT).strip()
</del><ins>+ command = command.split()
+ existing_portfile = \
+ subprocess.check_output(command, stderr=subprocess.STDOUT).strip()
</ins><span class="cx"> return existing_portfile
</span><span class="cx"> except Exception, e:
</span><span class="cx"> return False
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def checksums(pkg_name, pkg_version):
</span><span class="cx"> flag = False
</span><span class="cx"> print "Attempting to fetch distfiles..."
</span><span class="cx"> file_name = fetch_url(pkg_name, pkg_version, True)
</span><del>-# print file_name
</del><span class="cx"> if file_name:
</span><span class="cx"> checksums = []
</span><span class="cx"> try:
</span><del>-# h = hashlib.new('ripemd160')
-# with open(file_name) as f:
-# h.update(f.read())
-# checksums.insert(0, h.hexdigest())
-# checksums.insert(1, hashlib.sha256(f.read()).hexdigest())
</del><span class="cx"> print "Generating checksums..."
</span><span class="cx"> command = "openssl rmd160 "+file_name
</span><del>- checksums.insert(0,subprocess.check_output(command, shell=True, stderr=subprocess.STDOUT).split('=')[1].strip())
</del><ins>+ command = command.split()
+ rmd160 = subprocess.check_output(command, stderr=subprocess.STDOUT)
+ rmd160 = rmd160.split('=')[1].strip()
+ checksums.insert(0, rmd160)
</ins><span class="cx">
</span><span class="cx"> command = "openssl sha256 "+file_name
</span><del>- checksums.insert(1,subprocess.check_output(command, shell=True, stderr=subprocess.STDOUT).split('=')[1].strip())
</del><ins>+ command = command.split()
+ sha256 = subprocess.check_output(command, stderr=subprocess.STDOUT)
+ sha256 = sha256.split('=')[1].strip()
+ checksums.insert(1, sha256)
</ins><span class="cx">
</span><span class="cx"> dir = '/'.join(file_name.split('/')[0:-1])
</span><span class="cx"> if flag:
</span><span class="lines">@@ -226,9 +232,10 @@
</span><span class="cx"> print "Error\n"
</span><span class="cx"> return
</span><span class="cx">
</span><del>-def search_distfile(name,version):
</del><ins>+
+def search_distfile(name, version):
</ins><span class="cx"> try:
</span><del>- url = client.release_urls(name,version)[0]['url']
</del><ins>+ url = client.release_urls(name, version)[0]['url']
</ins><span class="cx"> r = requests.get(url, verify=False)
</span><span class="cx"> if not r.status_code == 200:
</span><span class="cx"> raise Error('No distfile')
</span><span class="lines">@@ -237,123 +244,141 @@
</span><span class="cx"> print "Please set a DISTFILE env var before generating the portfile"
</span><span class="cx"> sys.exit(0)
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def search_license(license):
</span><span class="cx"> license = license.lower()
</span><del>- patterns = ['.*mit.*','.*apache.*2','.*apache.*','.*bsd.*','.*agpl.*3',
- '.*agpl.*2','.*agpl.*','.*affero.*3','.*affero.*2','.*affero.*',
- '.*lgpl.*3','.*lgpl.*2','.*lgpl.*','.*gpl.*3','.*gpl.*2','.*gpl.*',
- '.*general.*public.*license.*3','.*general.*public.*license.*2',
- '.*general.*public.*license.*','.*mpl.*3','.*mpl.*2','.*mpl.*',
- '.*python.*license.*','^python$','.*']
- licenses = ['MIT','Apache-2','Apache','BSD','AGPL-3','AGPL-2','AGPL','AGPL-3',
- 'AGPL-2','AGPL','LGPL-3','LGPL-2','LGPL','GPL-3','GPL-2','GPL',
- 'GPL-3','GPL-2','GPL','MPL-3','MPL-2','MPL','Python','Python','NULL']
</del><ins>+ patterns = ['.*mit.*', '.*apache.*2', '.*apache.*', '.*bsd.*', '.*agpl.*3',
+ '.*agpl.*2', '.*agpl.*', '.*affero.*3', '.*affero.*2',
+ '.*affero.*', '.*lgpl.*3', '.*lgpl.*2', '.*lgpl.*', '.*gpl.*3',
+ '.*gpl.*2', '.*gpl.*', '.*general.*public.*license.*3',
+ '.*general.*public.*license.*2',
+ '.*general.*public.*license.*', '.*mpl.*3', '.*mpl.*2',
+ '.*mpl.*', '.*python.*license.*', '^python$', '.*']
+ licenses = ['MIT', 'Apache-2', 'Apache', 'BSD', 'AGPL-3', 'AGPL-2', 'AGPL',
+ 'AGPL-3', 'AGPL-2', 'AGPL', 'LGPL-3', 'LGPL-2', 'LGPL',
+ 'GPL-3', 'GPL-2', 'GPL', 'GPL-3', 'GPL-2', 'GPL', 'MPL-3',
+ 'MPL-2', 'MPL', 'Python', 'Python', 'NULL']
</ins><span class="cx"> for i in range(len(patterns)):
</span><del>- match = re.search(patterns[i],license)
</del><ins>+ match = re.search(patterns[i], license)
</ins><span class="cx"> if match:
</span><span class="cx"> return licenses[i]
</span><del>-
</del><span class="cx">
</span><del>-def port_testing(name,portv='27'):
</del><ins>+
+def port_testing(name, portv='27'):
</ins><span class="cx"> euid = os.geteuid()
</span><span class="cx"> if euid:
</span><del>- args = ['sudo',sys.executable] + sys.argv + [os.environ]
- os.execlpe('sudo',*args)
</del><ins>+ args = ['sudo', sys.executable] + sys.argv + [os.environ]
+ os.execlpe('sudo', *args)
</ins><span class="cx">
</span><del>- for phase in [port_fetch,port_checksum,port_extract,port_configure,port_build,port_destroot,port_clean]:
</del><ins>+ for phase in [port_fetch, port_checksum, port_extract, port_configure,
+ port_build, port_destroot, port_clean]:
</ins><span class="cx"> print phase.__name__
</span><del>- phase_output = phase(name,portv)
</del><ins>+ phase_output = phase(name, portv)
</ins><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"
- port_clean(name,portv)
</del><ins>+ print phase.__name__ + " FAILED"
+ port_clean(name, portv)
</ins><span class="cx"> print "Exiting"
</span><span class="cx"> sys.exit(1)
</span><span class="cx">
</span><span class="cx"> euid = os.geteuid()
</span><span class="cx"> if euid:
</span><del>- args = ['sudo',sys.executable] + sys.argv + [os.environ]
- os.execlpe('sudo',*args)
-
</del><ins>+ args = ['sudo', sys.executable] + sys.argv + [os.environ]
+ os.execlpe('sudo', *args)
</ins><span class="cx">
</span><span class="cx">
</span><del>-def port_fetch(name,portv='27'):
</del><ins>+def port_fetch(name, portv='27'):
</ins><span class="cx"> try:
</span><del>- command = "sudo port -t fetch dports/python/py-"+name+" subport=py"+portv+"-"+name
- phase_output = subprocess.check_call(command,shell=True,stderr=subprocess.STDOUT)
</del><ins>+ command = "sudo port -t fetch dports/python/py-" + \
+ name + " subport=py" + portv + "-" + name
+ command = command.split()
+ phase_output = subprocess.check_call(command, stderr=subprocess.STDOUT)
</ins><span class="cx"> return True
</span><span class="cx"> except:
</span><span class="cx"> return False
</span><span class="cx">
</span><span class="cx">
</span><del>-def port_checksum(name,portv='27'):
</del><ins>+def port_checksum(name, portv='27'):
</ins><span class="cx"> try:
</span><del>- command = "sudo port -t checksum dports/python/py-"+name+" subport=py"+portv+"-"+name
- phase_output = subprocess.check_call(command,shell=True,stderr=subprocess.STDOUT)
</del><ins>+ command = "sudo port -t checksum dports/python/py-" + \
+ name + " subport=py" + portv + "-" + name
+ command = command.split()
+ phase_output = subprocess.check_call(command, stderr=subprocess.STDOUT)
</ins><span class="cx"> return True
</span><span class="cx"> except:
</span><span class="cx"> return False
</span><span class="cx">
</span><span class="cx">
</span><del>-def port_extract(name,portv='27'):
</del><ins>+def port_extract(name, portv='27'):
</ins><span class="cx"> try:
</span><del>- command = "sudo port -t extract dports/python/py-"+name+" subport=py"+portv+"-"+name
- phase_output = subprocess.check_call(command,shell=True,stderr=subprocess.STDOUT)
</del><ins>+ command = "sudo port -t extract dports/python/py-" + \
+ name + " subport=py" + portv + "-" + name
+ command = command.split()
+ phase_output = subprocess.check_call(command, stderr=subprocess.STDOUT)
</ins><span class="cx"> return True
</span><span class="cx"> except:
</span><span class="cx"> return False
</span><span class="cx">
</span><span class="cx">
</span><del>-def port_patch(name,portv='27'):
</del><ins>+def port_patch(name, portv='27'):
</ins><span class="cx"> try:
</span><del>- command = "sudo port -t patch dports/python/py-"+name+" subport=py"+portv+"-"+name
- phase_output = subprocess.check_call(command,shell=True,stderr=subprocess.STDOUT)
</del><ins>+ command = "sudo port -t patch dports/python/py-" + \
+ name + " subport=py" + portv + "-" + name
+ command = command.split()
+ phase_output = subprocess.check_call(command, stderr=subprocess.STDOUT)
</ins><span class="cx"> return True
</span><span class="cx"> except:
</span><span class="cx"> return False
</span><span class="cx">
</span><span class="cx">
</span><del>-def port_configure(name,portv='27'):
</del><ins>+def port_configure(name, portv='27'):
</ins><span class="cx"> try:
</span><del>- command = "sudo port -t configure dports/python/py-"+name+" subport=py"+portv+"-"+name
- phase_output = subprocess.check_call(command,shell=True,stderr=subprocess.STDOUT)
</del><ins>+ command = "sudo port -t configure dports/python/py-" + \
+ name + " subport=py" + portv + "-" + name
+ command = command.split()
+ phase_output = subprocess.check_call(command, stderr=subprocess.STDOUT)
</ins><span class="cx"> return True
</span><span class="cx"> except:
</span><span class="cx"> return False
</span><span class="cx">
</span><span class="cx">
</span><del>-def port_build(name,portv='27'):
</del><ins>+def port_build(name, portv='27'):
</ins><span class="cx"> try:
</span><del>- command = "sudo port -t build dports/python/py-"+name+" subport=py"+portv+"-"+name
- phase_output = subprocess.check_call(command,shell=True,stderr=subprocess.STDOUT)
</del><ins>+ command = "sudo port -t build dports/python/py-" + \
+ name + " subport=py" + portv + "-" + name
+ command = command.split()
+ phase_output = subprocess.check_call(command, stderr=subprocess.STDOUT)
</ins><span class="cx"> return True
</span><span class="cx"> except:
</span><span class="cx"> return False
</span><span class="cx">
</span><span class="cx">
</span><del>-def port_destroot(name,portv='27'):
</del><ins>+def port_destroot(name, portv='27'):
</ins><span class="cx"> try:
</span><del>- command = "sudo port -t destroot dports/python/py-"+name+" subport=py"+portv+"-"+name
- phase_output = subprocess.check_call(command,shell=True,stderr=subprocess.STDOUT)
</del><ins>+ command = "sudo port -t destroot dports/python/py-" + \
+ name + " subport=py" + portv + "-" + name
+ command = command.split()
+ phase_output = subprocess.check_call(command, stderr=subprocess.STDOUT)
</ins><span class="cx"> return True
</span><span class="cx"> except:
</span><span class="cx"> return False
</span><del>-
</del><span class="cx">
</span><del>-def port_clean(name,portv='27'):
</del><ins>+
+def port_clean(name, portv='27'):
</ins><span class="cx"> try:
</span><del>- command = "sudo port -t clean dports/python/py-"+name+" subport=py"+portv+"-"+name
- phase_output = subprocess.check_call(command,shell=True,stderr=subprocess.STDOUT)
</del><ins>+ command = "sudo port -t clean dports/python/py-" + \
+ name + " subport=py" + portv + "-" + name
+ command = command.split()
+ phase_output = subprocess.check_call(command, stderr=subprocess.STDOUT)
</ins><span class="cx"> return True
</span><span class="cx"> except:
</span><span class="cx"> return False
</span><span class="cx">
</span><span class="cx">
</span><del>-
</del><span class="cx"> def create_portfile(dict, file_name, dict2):
</span><del>- search_distfile(dict['name'],dict['version'])
- print "Creating Portfile for pypi package "+dict['name']+"..."
</del><ins>+ search_distfile(dict['name'], dict['version'])
+ 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">@@ -367,22 +392,7 @@
</span><span class="cx">
</span><span class="cx"> file.write('platforms darwin\n')
</span><span class="cx"> license = dict['license']
</span><del>-# if license and not license == "UNKNOWN":
-# license = license.encode('utf-8')
-# license = filter(lambda x: x in string.printable, license)
-# license = license.split('\n')[0]
-# license = re.sub(r'[\[\]\{\}\;\:\$\t\"\'\`\=(--)]+', ' ', license)
-# license = re.sub(r'\s(\s)+', ' ', license)
-# license = re.sub(r'([A-Z]*)([a-z]*)([\s]*v*)([0-9]\.*[0-9]*)',
-# r'\1\2-\4', license)
-# license = re.sub(r'v(-*)([0-9])', r'\1\2', license)
-# file.write('license {0}\n'.format(license))
-# else:
-# print "No license found..."
-# print "Looking for license in environment variables..."
-# file.write('license {0}\n'.format(
-# os.getenv('license', 'None')))
- license = search_license(license)
</del><ins>+ license = search_license(license)
</ins><span class="cx"> file.write('license {0}\n'.format(license))
</span><span class="cx">
</span><span class="cx"> if dict['maintainer']:
</span><span class="lines">@@ -466,8 +476,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">@@ -485,24 +494,27 @@
</span><span class="cx"> print "Finding dependencies..."
</span><span class="cx"> file.write('if {${name} ne ${subport}} {\n')
</span><span class="cx"> file.write(' depends_lib-append \\\n')
</span><del>- file.write(' port:py${python.version}-setuptools')
</del><ins>+ file.write(' ' +
+ 'port:py${python.version}-setuptools')
</ins><span class="cx"> deps = dependencies(dict['name'], dict['version'], True)
</span><span class="cx"> if deps:
</span><del>- for item in ['setuptools','','\n']:
</del><ins>+ for item in ['setuptools', '', '\n']:
</ins><span class="cx"> while deps.count(item) > 0:
</span><span class="cx"> deps.remove(item)
</span><del>- if len(deps)>0:
</del><ins>+ if len(deps) > 0:
</ins><span class="cx"> file.write(" \\\n")
</span><span class="cx"> for dep in deps[:-1]:
</span><span class="cx"> dep = dep.split('>')[0].split('=')[0]
</span><del>- dep = dep.replace('[','').replace(']','')
-# if not(dep == "setuptools" or dep == "\n" or dep == ""):
-# file.write(' port:py${python.version}-'+dep+'\n')
- file.write(' port:py${python.version}-'+dep+' \\\n')
</del><ins>+ dep = dep.replace('[', '').replace(']', '')
+ file.write(' ' +
+ 'port:py${python.version}-' +
+ dep + ' \\\n')
</ins><span class="cx"> else:
</span><del>- file.write(' port:py${python.version}-'+deps[-1]+'\n')
</del><ins>+ file.write(' ' +
+ 'port:py${python.version}-' +
+ deps[-1] + '\n')
</ins><span class="cx"> else:
</span><del>- file.write("\n")
</del><ins>+ file.write("\n")
</ins><span class="cx"> file.write('\n')
</span><span class="cx"> file.write(' livecheck.type none\n')
</span><span class="cx"> if master_site_exists:
</span><span class="lines">@@ -529,6 +541,7 @@
</span><span class="cx"> else:
</span><span class="cx"> print "No port found."
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def print_portfile(pkg_name, pkg_version=None):
</span><span class="cx"> root_dir = os.path.abspath("./dports")
</span><span class="cx"> port_dir = os.path.join(root_dir, 'python')
</span><span class="lines">@@ -542,7 +555,7 @@
</span><span class="cx">
</span><span class="cx"> print "Attempting to fetch data from pypi..."
</span><span class="cx">
</span><del>- dict = client.release_data(pkg_name, pkg_version)
</del><ins>+ dict = client.release_data(pkg_name, pkg_version)
</ins><span class="cx"> dict2 = client.release_urls(pkg_name, pkg_version)
</span><span class="cx"> if dict and dict2:
</span><span class="cx"> print "Data fetched successfully."
</span><span class="lines">@@ -577,7 +590,7 @@
</span><span class="cx"> help='Prints the portfile for a package')
</span><span class="cx"> parser.add_argument('-t', '--test', action='store', type=str,
</span><span class="cx"> dest='package_test', nargs='*', required=False,
</span><del>- help='Tests the portfile for a package for various phase tests')
</del><ins>+ help='Tests the portfile for various phase tests')
</ins><span class="cx"> options = parser.parse_args()
</span><span class="cx">
</span><span class="cx"> if options.list:
</span></span></pre>
</div>
</div>
</body>
</html>