decathorpe/rust2rpm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make nested function non-nested

Browse source 
This is slow and hard to debug and there is no need to do it.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2018-08-13 17:12:20 +02:00
parent 80237720ae
commit 9ff9f2e1bd
1 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
rust2rpm/metadata.py
View file

@ -15,6 +15,24 @@ class Target(object):
def __repr__(self): def __repr__(self):
return "<Target {self.kind}|{self.name}>".format(self=self) return "<Target {self.kind}|{self.name}>".format(self=self)
def _req_to_str(name, spec=None, feature=None):
f_part = "/{}".format(feature) if feature is not None else ""
basestr = "crate({}{})".format(name, f_part)
if spec is None:
return basestr
if spec.kind == spec.KIND_EQUAL:
spec.kind = spec.KIND_SHORTEQ
if spec.kind == spec.KIND_ANY:
if spec.spec == "":
# Just wildcard
return basestr
else:
# Wildcard in string
assert False, spec.spec
version = str(spec.spec).replace('-', '~')
return "{} {} {}".format(basestr, spec.kind, version)
class Dependency(object): class Dependency(object):
def __init__(self, name, req, features=(), provides=False): def __init__(self, name, req, features=(), provides=False):
self.name = name self.name = name
@ -27,33 +45,15 @@ class Dependency(object):
raise Exception("Provides can't be applied to ranged version, {!r}".format(self.spec)) raise Exception("Provides can't be applied to ranged version, {!r}".format(self.spec))
def __repr__(self): def __repr__(self):
def req_to_str(name, spec=None, feature=None):
f_part = "/{}".format(feature) if feature is not None else ""
basestr = "crate({}{})".format(name, f_part)
if spec is not None:
if spec.kind == spec.KIND_EQUAL:
spec.kind = spec.KIND_SHORTEQ
if spec.kind == spec.KIND_ANY:
if spec.spec == "":
# Just wildcard
return basestr
else:
# Wildcard in string
assert False, spec.spec
version = str(spec.spec).replace('-', '~')
return "{} {} {}".format(basestr, spec.kind, version)
else:
return basestr
if self.provides: if self.provides:
spec = self.spec.specs[0] spec = self.spec.specs[0]
provs = [req_to_str(self.name, spec)] provs = [_req_to_str(self.name, spec)]
for feature in self.features: for feature in self.features:
provs.append(req_to_str(self.name, spec, feature)) provs.append(_req_to_str(self.name, spec, feature))
return " and ".join(provs) return " and ".join(provs)
reqs = [req_to_str(self.name, spec=req) for req in self.spec.specs] reqs = [_req_to_str(self.name, spec=req) for req in self.spec.specs]
features = [req_to_str(self.name, feature=feature) for feature in self.features] features = [_req_to_str(self.name, feature=feature) for feature in self.features]
use_rich = False use_rich = False
if len(reqs) > 1: if len(reqs) > 1: