commit 0164e5a2535f81334ed57c5b691629ba87acf5c7
Author: Michal Srb <msrb(a)redhat.com>
Date: Sat May 2 10:11:31 2015 +0200
Call get_*_str() with named args
python/javapackages/maven/artifact.py | 22 +++++++----
python/javapackages/maven/printer.py | 5 ++-
python/javapackages/metadata/alias.py | 6 ++-
python/javapackages/metadata/artifact.py | 45 ++++++++++++++++-------
python/javapackages/metadata/dependency.py | 20 ++++++----
python/javapackages/metadata/skippedartifact.py | 6 ++-
6 files changed, 69 insertions(+), 35 deletions(-)
---
diff --git a/python/javapackages/maven/artifact.py
b/python/javapackages/maven/artifact.py
index 1246cc6..ea5fbdd 100644
--- a/python/javapackages/maven/artifact.py
+++ b/python/javapackages/maven/artifact.py
@@ -57,16 +57,22 @@ class AbstractArtifact(object):
def get_mvn_str(self):
m = self.__get_members()
- return Printer.get_mvn_str(m['groupId'], m['artifactId'],
- m['extension'], m['classifier'],
- m['version'])
+ return Printer.get_mvn_str(m['groupId'],
+ m['artifactId'],
+ ext=m['extension'],
+ cla=m['classifier'],
+ ver=m['version'])
- def get_rpm_str(self, namespace="", compat=False, pkgver=None):
+ def get_rpm_str(self, namespace="", compat=None, pkgver=None):
m = self.__get_members()
- return Printer.get_rpm_str(m['groupId'], m['artifactId'],
- m['extension'], m['classifier'],
- m['version'], namespace=namespace,
- compat=compat, pkgver=pkgver)
+ return Printer.get_rpm_str(m['groupId'],
+ m['artifactId'],
+ ext=m['extension'],
+ cla=m['classifier'],
+ ver=m['version'],
+ namespace=namespace,
+ compat=compat,
+ pkgver=pkgver)
@staticmethod
def get_parts_from_mvn_str(mvnstr):
diff --git a/python/javapackages/maven/printer.py b/python/javapackages/maven/printer.py
index e2abaa4..564279f 100644
--- a/python/javapackages/maven/printer.py
+++ b/python/javapackages/maven/printer.py
@@ -58,9 +58,10 @@ def get_mvn_str(gid, aid, ext="", cla="",
ver=""):
def get_rpm_str(gid, aid, ext="", cla="", ver="",
namespace="",
compat=None, pkgver=None):
+ # TODO: "ver" is never used, get rid of it?
- mvnstr = get_mvn_str(gid, aid, ext, cla,
- compat if compat is not None else "")
+ mvnstr = get_mvn_str(gid, aid, ext=ext, cla=cla,
+ ver=compat if compat is not None else "")
rpmstr = "mvn({mvnstr})".format(mvnstr=mvnstr)
if namespace:
diff --git a/python/javapackages/metadata/alias.py
b/python/javapackages/metadata/alias.py
index 9903109..eb6f5b0 100644
--- a/python/javapackages/metadata/alias.py
+++ b/python/javapackages/metadata/alias.py
@@ -43,8 +43,10 @@ class MetadataAlias(ObjectBinding):
defaults = {'extension': 'jar'}
def get_mvn_str(self):
- return Printer.get_mvn_str(self.groupId, self.artifactId,
- self.extension, self.classifier)
+ return Printer.get_mvn_str(self.groupId,
+ self.artifactId,
+ ext=self.extension,
+ cla=self.classifier)
@classmethod
def from_mvn_str(cls, mvn_str):
diff --git a/python/javapackages/metadata/artifact.py
b/python/javapackages/metadata/artifact.py
index c83cca2..958d28e 100644
--- a/python/javapackages/metadata/artifact.py
+++ b/python/javapackages/metadata/artifact.py
@@ -60,7 +60,7 @@ class MetadataArtifact(ObjectBinding):
def __init__(self, *args, **kwargs):
super(MetadataArtifact, self).__init__(*args, **kwargs)
for alias in self.aliases:
- if not 'extension' in alias and 'extension' in self:
+ if 'extension' not in alias and 'extension' in self:
alias.extension = self.extension
def is_compat(self):
@@ -84,33 +84,52 @@ class MetadataArtifact(ObjectBinding):
return os.path.join(prefix, self.path[1:])
def get_mvn_str(self):
- return Printer.get_mvn_str(self.groupId, self.artifactId,
- self.extension, self.classifier,
- self.version)
+ return Printer.get_mvn_str(self.groupId,
+ self.artifactId,
+ ext=self.extension,
+ cla=self.classifier,
+ ver=self.version)
def get_rpm_str(self, namespace="", pkgver=None):
result = []
if not self.is_compat():
# non-compat rpm string for main artifact
- result.append(Printer.get_rpm_str(self.groupId, self.artifactId,
- self.extension, self.classifier, namespace=namespace,
pkgver=pkgver))
+ result.append(Printer.get_rpm_str(self.groupId,
+ self.artifactId,
+ ext=self.extension,
+ cla=self.classifier,
+ namespace=namespace,
+ pkgver=pkgver))
# non-compat rpm string(s) for aliases
for alias in self.aliases:
- result.append(Printer.get_rpm_str(alias.groupId, alias.artifactId,
alias.extension,
- alias.classifier, namespace=namespace,
pkgver=pkgver))
+ result.append(Printer.get_rpm_str(alias.groupId,
+ alias.artifactId,
+ ext=alias.extension,
+ cla=alias.classifier,
+ namespace=namespace,
+ pkgver=pkgver))
else:
# compat rpm string(s) for main artifact
for compat_ver in self.compatVersions:
- result.append(Printer.get_rpm_str(self.groupId, self.artifactId,
self.extension, self.classifier,
- compat=compat_ver, namespace=namespace,
pkgver=pkgver))
+ result.append(Printer.get_rpm_str(self.groupId,
+ self.artifactId,
+ ext=self.extension,
+ cla=self.classifier,
+ compat=compat_ver,
+ namespace=namespace,
+ pkgver=pkgver))
# compat rpm string(s) for aliases
for alias in self.aliases:
- result.append(Printer.get_rpm_str(alias.groupId, alias.artifactId,
alias.extension,
- alias.classifier,
compat=compat_ver,
- namespace=namespace,
pkgver=pkgver))
+ result.append(Printer.get_rpm_str(alias.groupId,
+ alias.artifactId,
+ ext=alias.extension,
+ cla=alias.classifier,
+ compat=compat_ver,
+ namespace=namespace,
+ pkgver=pkgver))
return "\n".join(result)
def __unicode__(self):
diff --git a/python/javapackages/metadata/dependency.py
b/python/javapackages/metadata/dependency.py
index ef5511b..fa66257 100644
--- a/python/javapackages/metadata/dependency.py
+++ b/python/javapackages/metadata/dependency.py
@@ -39,6 +39,7 @@ from javapackages.common.binding import ObjectBinding
import six
+
class MetadataDependency(ObjectBinding):
element_name = 'dependency'
fields = ['groupId', 'artifactId', 'extension',
'classifier',
@@ -46,7 +47,7 @@ class MetadataDependency(ObjectBinding):
'resolvedVersion', 'exclusions']
defaults = {'extension': 'jar',
'requestedVersion': 'SYSTEM'}
- types = {'optional': str, # todo bool
+ types = {'optional': str, # todo bool
'exclusions': set([MetadataExclusion])}
def is_optional(self):
@@ -55,14 +56,17 @@ class MetadataDependency(ObjectBinding):
return False
def get_mvn_str(self):
- return Printer.get_mvn_str(self.groupId, self.artifactId,
- self.extension, self.classifier,
- self.requestedVersion)
-
- def get_rpm_str(self, namespace="", compat=False, pkgver=None):
- return Printer.get_rpm_str(self.groupId, self.artifactId,
- self.extension, self.classifier,
- self.requestedVersion,
+ return Printer.get_mvn_str(self.groupId,
+ self.artifactId,
+ ext=self.extension,
+ cla=self.classifier,
+ ver=self.requestedVersion)
+
+ def get_rpm_str(self, namespace="", compat=None, pkgver=None):
+ return Printer.get_rpm_str(self.groupId,
+ self.artifactId,
+ ext=self.extension,
+ cla=self.classifier,
namespace=namespace or self.namespace,
compat=compat or self.resolvedVersion,
pkgver=pkgver)
diff --git a/python/javapackages/metadata/skippedartifact.py
b/python/javapackages/metadata/skippedartifact.py
index fcf876a..640689f 100644
--- a/python/javapackages/metadata/skippedartifact.py
+++ b/python/javapackages/metadata/skippedartifact.py
@@ -43,8 +43,10 @@ class MetadataSkippedArtifact(ObjectBinding):
defaults = {'extension': 'jar'}
def get_mvn_str(self):
- return Printer.get_mvn_str(self.groupId, self.artifactId,
- self.extension, self.classifier)
+ return Printer.get_mvn_str(self.groupId,
+ self.artifactId,
+ ext=self.extension,
+ cla=self.classifier)
@classmethod
def from_mvn_str(cls, mvn_str):