Pisilinux3/pisi
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

/usr/lib/pardus/pisi/util.py:75: Invalid arguments to (map), got 1, expected at least 2

Browse Source 
/usr/lib/pardus/pisi/util.py:271: (dir) shadows builtin
/usr/lib/pardus/pisi/util.py:396: (dir) shadows builtin
/usr/lib/pardus/pisi/util.py:458: Local variable (e) not used
/usr/lib/pardus/pisi/util.py:613: Using is , may not always work

pıhh
This commit is contained in:
S.Çağlar Onur
2007-05-14 00:07:12 +00:00
parent 18f873c621
commit 834e8d7462
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pisi/util.py
+9 -10
View File
@@ -72,7 +72,7 @@ def multisplit(str, chars):
"""Split str with any of the chars.""" """Split str with any of the chars."""
l = [str] l = [str]
for c in chars: for c in chars:
l = concat(map(lambda x:x.split(c), l)) l = concat(map(lambda x:x.split(c)), l)
return l return l
def same(l): def same(l):
@@ -265,12 +265,12 @@ def check_file(file, mode = os.F_OK):
return True return True
# FIXME: check_dir is not a good name considering it can also create the dir # FIXME: check_dir is not a good name considering it can also create the dir
def check_dir(dir): def check_dir(d):
"""Make sure given directory path exists.""" """Make sure given directory path exists."""
# FIXME: What is first strip doing there? # FIXME: What is first strip doing there?
dir = dir.strip().rstrip("/") d = d.strip().rstrip("/")
if not os.access(dir, os.F_OK): if not os.access(d, os.F_OK):
os.makedirs(dir) os.makedirs(d)
def clean_dir(path): def clean_dir(path):
"""Remove all content of a directory.""" """Remove all content of a directory."""
@@ -393,8 +393,8 @@ def get_file_hashes(top, excludePrefix=None, removePrefix=None):
continue continue
#bug 397 #bug 397
for dir in dirs: for directory in dirs:
d = join_path(root, dir) d = join_path(root, directory)
if os.path.islink(d) and not has_excluded_prefix(d): if os.path.islink(d) and not has_excluded_prefix(d):
yield (d, sha1_sum(os.readlink(d), True)) yield (d, sha1_sum(os.readlink(d), True))
excludePrefix.append(remove_prefix(removePrefix, d) + "/") excludePrefix.append(remove_prefix(removePrefix, d) + "/")
@@ -455,7 +455,7 @@ def sha1_data(data):
return m.hexdigest() return m.hexdigest()
except KeyboardInterrupt: except KeyboardInterrupt:
raise raise
except Exception, e: #FIXME: what exception could we catch here, replace with that. except Exception: #FIXME: what exception could we catch here, replace with that.
raise Error(_("Cannot calculate SHA1 hash of given data")) raise Error(_("Cannot calculate SHA1 hash of given data"))
def uncompress(patchFile, compressType="gz", targetDir=None): def uncompress(patchFile, compressType="gz", targetDir=None):
@@ -607,10 +607,9 @@ def is_package_name(fn, package_name = None):
# get version string, skip separator '-' # get version string, skip separator '-'
verstr = fn[len(package_name) + 1: verstr = fn[len(package_name) + 1:
len(fn)-len(ctx.const.package_suffix)] len(fn)-len(ctx.const.package_suffix)]
import string
for x in verstr.split('-'): for x in verstr.split('-'):
# weak rule: version components after '-' start with a digit # weak rule: version components after '-' start with a digit
if x is '' or (not x[0] in string.digits): if x == '' or (not x[0] in string.digits):
return False return False
return True return True
return False return False