<!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>[120974] branches/gsoc14-pip2port/tester.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/120974">120974</a></dd>
<dt>Author</dt> <dd>gaurav@macports.org</dd>
<dt>Date</dt> <dd>2014-06-13 01:23:08 -0700 (Fri, 13 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>met PEP8 coding standards</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesgsoc14pip2porttesterpy">branches/gsoc14-pip2port/tester.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesgsoc14pip2porttesterpy"></a>
<div class="modfile"><h4>Modified: branches/gsoc14-pip2port/tester.py (120973 => 120974)</h4>
<pre class="diff"><span>
<span class="info">--- branches/gsoc14-pip2port/tester.py 2014-06-13 08:02:46 UTC (rev 120973)
+++ branches/gsoc14-pip2port/tester.py 2014-06-13 08:23:08 UTC (rev 120974)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> __doc__ = """...Tester Script for pypi2port..."""
</span><span class="cx">
</span><span class="cx"> # -*- coding: utf-8 -*-
</span><del>-#! /usr/bin/env python
</del><ins>+# !/usr/bin/env python
</ins><span class="cx">
</span><span class="cx"> import argparse
</span><span class="cx"> import sys
</span><span class="lines">@@ -25,61 +25,39 @@
</span><span class="cx">
</span><span class="cx"> client = xmlrpclib.ServerProxy('http://pypi.python.org/pypi')
</span><span class="cx">
</span><ins>+
</ins><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><span class="cx"> print package
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def search(pkg_name):
</span><span class="cx"> print "\n"
</span><del>- values=client.search({'name':pkg_name})
</del><ins>+ values = client.search({'name': pkg_name})
</ins><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"> print "\n"
</span><span class="cx">
</span><del>-def release_data(pkg_name,pkg_version):
</del><ins>+
+def release_data(pkg_name, pkg_version):
</ins><span class="cx"> print "\n"
</span><span class="cx"> if pkg_version:
</span><del>- values = client.release_data(pkg_name,pkg_version)
</del><ins>+ values = client.release_data(pkg_name, pkg_version)
</ins><span class="cx"> if values:
</span><span class="cx"> for key in values.keys():
</span><del>-# value = values[key]
-# if value:
-# value = value.encode('utf-8')
- print key,'-->',values[key]
</del><ins>+ print key, '-->', values[key]
</ins><span class="cx"> else:
</span><span class="cx"> print "No such package found."
</span><span class="cx"> print "Please specify the exact package name."
</span><span class="cx"> print "\n"
</span><span class="cx"> return
</span><del>-# else :
-# pkg_version = client.package_releases(pkg_name, True)
-# print pkg_version
-# return
-# if not pkg_version:
-# print "No release available"
-# return
-# value = {}
-# for version in pkg_version:
-# print version
-# values = client.release_data(pkg_name,version)
-# if value:
-# for key in values.keys():
-# if not value[key] or value[key]=="":
-# values.update(key,value[key])
-# values.update(value)
-# value = values
-# if values:
-# for key in values.keys():
-# print key,'-->',values[key]
-# else:
-# print "No such package found."
-# print "Please specify the exact package name."
</del><span class="cx"> print "\n"
</span><span class="cx"> return
</span><span class="cx">
</span><del>-def fetch(pkg_name,dict):
</del><ins>+
+def fetch(pkg_name, dict):
</ins><span class="cx"> checksum_md5 = dict['md5_digest']
</span><span class="cx"> parent_dir = './sources'
</span><span class="cx"> src_dir = parent_dir + '/' + pkg_name
</span><span class="lines">@@ -92,12 +70,13 @@
</span><span class="cx"> file_name = src_dir + '/' + dict['filename']
</span><span class="cx">
</span><span class="cx"> u = urllib2.urlopen(url)
</span><del>-# f = open(file_name,'wb')
- with open(file_name,'wb') as f:
</del><ins>+ with open(file_name, 'wb') as f:
</ins><span class="cx"> meta = u.info()
</span><span class="cx"> file_size = int(meta.getheaders("Content-Length")[0])
</span><span class="cx">
</span><del>- widgets = ['Fetching: ', Percentage(), ' ', Bar(marker=RotatingMarker(),left='[',right=']'), ' ', ETA(), ' ', FileTransferSpeed()]
</del><ins>+ widgets = ['Fetching: ', Percentage(), ' ',
+ Bar(marker=RotatingMarker(), left='[', right=']'),
+ ' ', ETA(), ' ', FileTransferSpeed()]
</ins><span class="cx"> pbar = ProgressBar(widgets=widgets, maxval=int(file_size))
</span><span class="cx"> pbar.start()
</span><span class="cx">
</span><span class="lines">@@ -114,7 +93,6 @@
</span><span class="cx">
</span><span class="cx"> pbar.finish()
</span><span class="cx"> print
</span><del>-# f.close()
</del><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><span class="lines">@@ -124,8 +102,7 @@
</span><span class="cx"> zip = zipfile.ZipFile(file_name)
</span><span class="cx"> for name in zip.namelist():
</span><span class="cx"> if name.split("/")[0] == "EGG-INFO":
</span><del>-# print name
- zip.extract(name,src_dir)
</del><ins>+ zip.extract(name, src_dir)
</ins><span class="cx"> print "\n"
</span><span class="cx"> return file_name
</span><span class="cx"> else:
</span><span class="lines">@@ -133,55 +110,53 @@
</span><span class="cx"> try:
</span><span class="cx"> os.remove(file_name)
</span><span class="cx"> except OSError, e:
</span><del>- print "Error: %s - %s." % (e.filename,e.strerror)
</del><ins>+ print "Error: %s - %s." % (e.filename, e.strerror)
</ins><span class="cx"> print "\n"
</span><span class="cx"> return False
</span><span class="cx">
</span><del>-def fetch_url(pkg_name,pkg_version,checksum=False,deps=False):
- values = client.release_urls(pkg_name,pkg_version)
</del><ins>+
+def fetch_url(pkg_name, pkg_version, checksum=False, deps=False):
+ values = client.release_urls(pkg_name, pkg_version)
</ins><span class="cx"> if checksum:
</span><span class="cx"> for value in values:
</span><span class="cx"> if value['filename'].split('.')[-1] == 'gz':
</span><del>- return fetch(pkg_name,value)
-
-# elif deps:
-# for value in values:
-# if not value['filename'].split('.')[-1] == 'gz':
-# return fetch(pkg_name,value)
</del><ins>+ return fetch(pkg_name, value)
</ins><span class="cx"> else:
</span><span class="cx"> print "\n"
</span><span class="cx"> for value in values:
</span><del>- return fetch(pkg_name,value)
</del><ins>+ return fetch(pkg_name, value)
</ins><span class="cx">
</span><del>-def dependencies(pkg_name,pkg_version,deps=False):
</del><ins>+
+def dependencies(pkg_name, pkg_version, deps=False):
</ins><span class="cx"> if not deps:
</span><span class="cx"> return
</span><del>- values = client.release_urls(pkg_name,pkg_version)
</del><ins>+ values = client.release_urls(pkg_name, pkg_version)
</ins><span class="cx"> for value in values:
</span><span class="cx"> if not value['filename'].split('.')[-1] == 'gz':
</span><del>- fetch(pkg_name,value)
</del><ins>+ fetch(pkg_name, value)
</ins><span class="cx"> try:
</span><del>- # f = open('./sources/'+pkg_name+'/EGG-INFO/requires.txt')
- with open('./sources/'+pkg_name+'/EGG-INFO/requires.txt') as f:
</del><ins>+ with open('./sources/' + 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="cx"> try:
</span><del>- shutil.rmtree('./sources/'+pkg_name+'/EGG-INFO', ignore_errors=True)
- items = os.listdir('./sources/'+pkg_name)
</del><ins>+ shutil.rmtree('./sources/' + pkg_name + '/EGG-INFO',
+ ignore_errors=True)
+ items = os.listdir('./sources/' + pkg_name)
</ins><span class="cx"> for item in items[:]:
</span><span class="cx"> if not item.split('.')[-1] == 'gz':
</span><del>- os.remove('./sources/'+pkg_name+'/'+item)
</del><ins>+ os.remove('./sources/' + pkg_name + '/' + item)
</ins><span class="cx"> items.remove(item)
</span><span class="cx">
</span><span class="cx"> if not items:
</span><del>- os.rmdir('./sources/'+pkg_name)
</del><ins>+ os.rmdir('./sources/' + pkg_name)
</ins><span class="cx"> except:
</span><span class="cx"> print ""
</span><span class="cx"> return list
</span><span class="cx"> except:
</span><span class="cx"> try:
</span><del>- shutil.rmtree('./sources/'+pkg_name+'/EGG-INFO', ignore_errors=True)
</del><ins>+ shutil.rmtree('./sources/'+pkg_name+'/EGG-INFO',
+ ignore_errors=True)
</ins><span class="cx"> items = os.listdir('./sources/'+pkg_name)
</span><span class="cx"> for item in items[:]:
</span><span class="cx"> if not item.split('.')[-1] == 'gz':
</span><span class="lines">@@ -194,42 +169,40 @@
</span><span class="cx"> return False
</span><span class="cx">
</span><span class="cx">
</span><del>-def checksums(pkg_name,pkg_version):
- file_name = fetch_url(pkg_name,pkg_version,True)
</del><ins>+def checksums(pkg_name, pkg_version):
+ file_name = fetch_url(pkg_name, pkg_version, True)
</ins><span class="cx"> print file_name
</span><span class="cx"> if file_name:
</span><span class="cx"> checksums = []
</span><span class="cx"> try:
</span><span class="cx"> h = hashlib.new('ripemd160')
</span><del>-# f = open(file_name)
- with open(file_name) as f:
</del><ins>+ with open(file_name) as f:
</ins><span class="cx"> h.update(f.read())
</span><del>- checksums.insert(0,h.hexdigest())
- checksums.insert(1,hashlib.sha256(f.read()).hexdigest())
-# f.close()
</del><ins>+ checksums.insert(0, h.hexdigest())
+ checksums.insert(1, hashlib.sha256(f.read()).hexdigest())
</ins><span class="cx"> dir = '/'.join(file_name.split('/')[0:-1])
</span><span class="cx"> os.remove(file_name)
</span><span class="cx"> try:
</span><span class="cx"> os.rmdir(dir)
</span><span class="cx"> except OSError as ex:
</span><del>- print
</del><ins>+ print
</ins><span class="cx"> return checksums
</span><span class="cx"> except:
</span><span class="cx"> print "Error\n"
</span><span class="cx"> return
</span><span class="cx">
</span><span class="cx">
</span><del>-def create_portfile(dict,file_name,dict2):
-# file = open(file_name, 'w')
</del><ins>+def create_portfile(dict, file_name, dict2):
</ins><span class="cx"> with open(file_name, 'w') as file:
</span><del>- file.write('# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4\n')
</del><ins>+ file.write('# -*- coding: utf-8; mode: tcl; tab-width: 4; ')
+ file.write('indent-tabs-mode: nil; c-basic-offset: 4 ')
+ file.write('-*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4\n')
</ins><span class="cx"> file.write('# $Id$\n\n')
</span><span class="cx"> file.write('PortSystem 1.0\n')
</span><span class="cx"> file.write('PortGroup python 1.0\n\n')
</span><span class="cx">
</span><span class="cx"> file.write('name {0}\n'.format(dict['name']))
</span><span class="cx"> file.write('version {0}\n'.format(dict['version']))
</span><del>-# file.write('categories-append replaceme\n\n')
</del><span class="cx">
</span><span class="cx"> file.write('platforms darwin\n')
</span><span class="cx"> license = dict['license']
</span><span class="lines">@@ -238,20 +211,22 @@
</span><span class="cx"> file.write('license {0}\n'.format(license))
</span><span class="cx"> else:
</span><span class="cx"> file.write('license None\n')
</span><del>-
</del><ins>+
</ins><span class="cx"> if dict['maintainer']:
</span><del>- file.write('maintainers {0}\n\n'.format(' '.join(dict['maintainer'])))
</del><ins>+ maintainers = ' '.join(dict['maintainer'])
+ file.write('maintainers {0}\n\n'.format(maintainers))
</ins><span class="cx"> else:
</span><span class="cx"> file.write('maintainers nomaintainer\n\n')
</span><span class="cx">
</span><span class="cx"> summary = dict['summary']
</span><span class="cx"> if summary:
</span><del>- summary = re.sub(r'[\[\]\{\}\;\:\$\t\"\'\`]',' ',summary)
- sum_lines = textwrap.wrap(summary,width=70)
</del><ins>+ summary = re.sub(r'[\[\]\{\}\;\:\$\t\"\'\`]*',
+ ' ', summary)
+ sum_lines = textwrap.wrap(summary, width=70)
</ins><span class="cx"> file.write('description ')
</span><span class="cx"> for sum_line in sum_lines:
</span><span class="cx"> if sum_line:
</span><del>- if not sum_lines.index(sum_line)==0:
</del><ins>+ if not sum_lines.index(sum_line) == 0:
</ins><span class="cx"> file.write(' ')
</span><span class="cx"> if sum_line == sum_lines[-1]:
</span><span class="cx"> file.write("{0}\n".format(sum_line))
</span><span class="lines">@@ -259,19 +234,15 @@
</span><span class="cx"> file.write("{0} \\\n".format(sum_line))
</span><span class="cx"> else:
</span><span class="cx"> file.write('description None\n\n')
</span><del>-# file.write('description '+dict['summary']+'\n\n')
-# file.write('description '+summary+'\n\n')
-# file.write('long_description '+dict['description']+'\n\n')
</del><span class="cx"> description = dict['description']
</span><span class="cx"> if description:
</span><span class="cx"> description = description.encode('utf-8')
</span><del>- description = re.sub(r'[\[\]\{\}\;\:\$\t\"\'\`]',' ',description)
-# lines = textwrap.wrap(dict['description'],width=70)
- lines = textwrap.wrap(description,width=70)
</del><ins>+ description = re.sub(r'[\[\]\{\}\;\:\$\t\"\'\`]', ' ', description)
+ lines = textwrap.wrap(description, width=70)
</ins><span class="cx"> file.write('long_description ')
</span><span class="cx"> for line in lines:
</span><span class="cx"> if line:
</span><del>- if not lines.index(line)==0:
</del><ins>+ if not lines.index(line) == 0:
</ins><span class="cx"> file.write(' ')
</span><span class="cx"> if line == lines[-1]:
</span><span class="cx"> file.write("{0}\n".format(line))
</span><span class="lines">@@ -279,7 +250,7 @@
</span><span class="cx"> file.write("{0} \\\n".format(line))
</span><span class="cx"> else:
</span><span class="cx"> file.write('long_description ${description}\n\n')
</span><del>-
</del><ins>+
</ins><span class="cx"> file.write('homepage {0}\n'.format(dict['home_page']))
</span><span class="cx">
</span><span class="cx"> if dict2:
</span><span class="lines">@@ -287,24 +258,26 @@
</span><span class="cx"> else:
</span><span class="cx"> master_site = ''
</span><span class="cx"> file.write('master_sites {0}\n'.format(master_site))
</span><del>- file.write('distname py-{0}{1}\n\n'.format(dict['name'],dict['version']))
-# rmd160 = checksum_rmd160(dict['name'],dict['version'])
-# sha256 = checksum_sha256(dict['name'],dict['version'])
- checksums_values = checksums(dict['name'],dict['version'])
-# if rmd160 and sha256:
</del><ins>+ file.write('distname py-{0}{1}\n\n'.format(
+ dict['name'], dict['version']))
+ checksums_values = checksums(dict['name'], dict['version'])
</ins><span class="cx"> if checksums_values:
</span><del>- file.write('checksums rmd160 {0} \\ \n'.format(checksums_values[0]))
- file.write(' sha256 {0}\n\n'.format(checksums_values[1]))
</del><ins>+ file.write('checksums rmd160 {0} \\ \n'.format(
+ checksums_values[0]))
+ file.write(' sha256 {0}\n\n'.format(
+ checksums_values[1]))
</ins><span class="cx">
</span><span class="cx"> python_vers = dict['requires_python']
</span><span class="cx"> if python_vers:
</span><del>- file.write('python.versions 25 26 27 {0}\n\n'.format(dict['requires_python']))
</del><ins>+ file.write('python.versions 25 26 27 {0}\n\n'.format(
+ dict['requires_python']))
</ins><span class="cx"> else:
</span><span class="cx"> file.write('python.versions 25 26 27\n\n')
</span><del>-
</del><ins>+
</ins><span class="cx"> file.write('if {${name} ne ${subport}} {\n')
</span><del>- file.write(' depends_build port:py${python.version}-setuptools\n')
- deps = dependencies(dict['name'],dict['version'],True)
</del><ins>+ file.write(' depends_build port:')
+ file.write('py${python.version}-setuptools\n')
+ deps = dependencies(dict['name'], dict['version'], True)
</ins><span class="cx"> if deps:
</span><span class="cx"> for dep in deps:
</span><span class="cx"> file.write(' port:py-{0}\n'.format(dep))
</span><span class="lines">@@ -313,20 +286,14 @@
</span><span class="cx"> file.write('} else {\n')
</span><span class="cx"> file.write(' livecheck.type regex\n')
</span><span class="cx"> file.write(' livecheck.url ${master_sites}\n')
</span><del>-# file.write(' livecheck.regex \n')
</del><span class="cx"> file.write('}\n')
</span><span class="cx">
</span><del>-# file.write(' post-destroot {\n')
</del><span class="cx">
</span><del>-
-
-
-def print_portfile(pkg_name,pkg_version=None):
</del><ins>+def print_portfile(pkg_name, pkg_version=None):
</ins><span class="cx"> print "\n"
</span><span class="cx"> root_dir = os.path.abspath("./sources")
</span><del>- port_dir = os.path.join(root_dir,'Python')
- home_dir = os.path.join(port_dir,pkg_name)
-# src_dir = os.path.join(home_dir,"PortFile")
</del><ins>+ port_dir = os.path.join(root_dir, 'Python')
+ home_dir = os.path.join(port_dir, pkg_name)
</ins><span class="cx"> if not os.path.exists(root_dir):
</span><span class="cx"> os.makedirs(root_dir)
</span><span class="cx"> if not os.path.exists(port_dir):
</span><span class="lines">@@ -334,39 +301,34 @@
</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>- dict = client.release_data(pkg_name,pkg_version)
- dict2 = client.release_urls(pkg_name,pkg_version)
</del><ins>+ dict = client.release_data(pkg_name, pkg_version)
+ dict2 = client.release_urls(pkg_name, pkg_version)
</ins><span class="cx">
</span><del>- file_name = os.path.join(home_dir,"Portfile")
-# try:
-# create_portfile(dict,file_name,dict2)
-# print "SUCCESS\n"
- create_portfile(dict,file_name,dict2)
</del><ins>+ file_name = os.path.join(home_dir, "Portfile")
+ create_portfile(dict, file_name, dict2)
</ins><span class="cx"> print "SUCCESS\n"
</span><del>-# except:
-# print "ERROR"
</del><span class="cx">
</span><ins>+
</ins><span class="cx"> def main(argv):
</span><span class="cx"> parser = argparse.ArgumentParser(description="Pypi2Port Tester")
</span><span class="cx"> parser.add_argument('-l', '--list', action='store_true', dest='list',
</span><span class="cx"> default=False, required=False,
</span><span class="cx"> help='List all packages')
</span><span class="cx"> parser.add_argument('-s', '--search', action='store', type=str,
</span><del>- dest='packages_search', nargs='*', required=False,
- help='Search for a package by <package_name>')
</del><ins>+ dest='packages_search', nargs='*', required=False,
+ help='Search for a package')
</ins><span class="cx"> parser.add_argument('-d', '--data', action='store',
</span><span class="cx"> dest='packages_data', nargs='*', type=str,
</span><del>- help='Releases data for a package by <package_name>')
</del><ins>+ help='Releases data for a package')
</ins><span class="cx"> parser.add_argument('-f', '--fetch', action='store', type=str,
</span><del>- dest='package_fetch', nargs='*', required=False,
- help='Fetches distfiles for a package by <package_name> and <package_version>')
</del><ins>+ dest='package_fetch', nargs='*', required=False,
+ help='Fetches distfiles for a package')
</ins><span class="cx"> parser.add_argument('-p', '--portfile', action='store', type=str,
</span><del>- dest='package_portfile', nargs='*', required=False,
- help='Prints the portfile for a package by <package_name> and <package_version>')
</del><ins>+ dest='package_portfile', nargs='*', required=False,
+ help='Prints the portfile for a package')
</ins><span class="cx"> options = parser.parse_args()
</span><del>-# print options
</del><span class="cx">
</span><del>- if options.list == True:
</del><ins>+ if options.list:
</ins><span class="cx"> list_all()
</span><span class="cx"> return
</span><span class="cx">
</span><span class="lines">@@ -379,24 +341,25 @@
</span><span class="cx"> pkg_name = options.packages_data[0]
</span><span class="cx"> if len(options.packages_data) > 1:
</span><span class="cx"> pkg_version = options.packages_data[1]
</span><del>- release_data(pkg_name,pkg_version)
</del><ins>+ release_data(pkg_name, pkg_version)
</ins><span class="cx"> else:
</span><span class="cx"> if client.package_releases(pkg_name):
</span><span class="cx"> pkg_version = client.package_releases(pkg_name)[0]
</span><del>- release_data(pkg_name,pkg_version)
-# release_data(pkg_name)
</del><ins>+ release_data(pkg_name, pkg_version)
+ else:
+ print "No release found\n"
</ins><span class="cx"> return
</span><span class="cx">
</span><span class="cx"> if options.package_fetch:
</span><span class="cx"> pkg_name = options.package_fetch[0]
</span><span class="cx"> if len(options.package_fetch) > 1:
</span><span class="cx"> pkg_version = options.package_fetch[1]
</span><del>- fetch_url(pkg_name,pkg_version)
</del><ins>+ fetch_url(pkg_name, pkg_version)
</ins><span class="cx"> else:
</span><del>- releases = client.package_releases(pkg_name)
</del><ins>+ releases = client.package_releases(pkg_name)
</ins><span class="cx"> if releases:
</span><span class="cx"> pkg_version = releases[0]
</span><del>- fetch_url(pkg_name,pkg_version)
</del><ins>+ fetch_url(pkg_name, pkg_version)
</ins><span class="cx"> else:
</span><span class="cx"> print "No release found\n"
</span><span class="cx"> return
</span><span class="lines">@@ -405,14 +368,14 @@
</span><span class="cx"> pkg_name = options.package_portfile[0]
</span><span class="cx"> if len(options.package_portfile) > 1:
</span><span class="cx"> pkg_version = options.package_portfile[1]
</span><del>-# print "PORTFILE %s %s\n" % (pkg_name,pkg_version)
- print_portfile(pkg_name,pkg_version)
</del><ins>+ print_portfile(pkg_name, pkg_version)
</ins><span class="cx"> else:
</span><span class="cx"> vers = client.package_releases(pkg_name)
</span><span class="cx"> if vers:
</span><span class="cx"> pkg_version = vers[0]
</span><del>-# print "PORTFILE %s %s\n" % (pkg_name,pkg_version)
- print_portfile(pkg_name,pkg_version)
</del><ins>+ print_portfile(pkg_name, pkg_version)
+ else:
+ print "No release found\n"
</ins><span class="cx"> return
</span><span class="cx">
</span><span class="cx"> parser.print_help()
</span></span></pre>
</div>
</div>
</body>
</html>