[yum-cvs] yum/yum __init__.py, 1.246, 1.247 misc.py, 1.18, 1.19 packages.py, 1.65, 1.66
Seth Vidal
skvidal at linux.duke.edu
Fri Sep 8 16:21:34 UTC 2006
Update of /home/groups/yum/cvs/yum/yum
In directory login1.linux.duke.edu:/tmp/cvs-serv18994
Modified Files:
__init__.py misc.py packages.py
Log Message:
- move refineSearchPattern into misc from YumBase
- clean up some pychecker errors
Index: __init__.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/__init__.py,v
retrieving revision 1.246
retrieving revision 1.247
diff -u -r1.246 -r1.247
--- __init__.py 8 Sep 2006 13:32:51 -0000 1.246
+++ __init__.py 8 Sep 2006 16:21:32 -0000 1.247
@@ -16,7 +16,6 @@
import os
-import sys
import os.path
import rpm
import re
@@ -37,7 +36,6 @@
import rpmUtils.transaction
import comps
import config
-import parser
import repos
import misc
import transactioninfo
@@ -51,7 +49,6 @@
from packages import parsePackages, YumAvailablePackage, YumLocalPackage, YumInstalledPackage
from constants import *
-from packageSack import ListPackageSack
__version__ = '2.9.6'
@@ -1078,16 +1075,7 @@
return ygh
- def _refineSearchPattern(self, arg):
- """Takes a search string from the cli for Search or Provides
- and cleans it up so it doesn't make us vomit"""
-
- if re.match('.*[\*,\[,\],\{,\},\?,\+].*', arg):
- restring = fnmatch.translate(arg)
- else:
- restring = re.escape(arg)
-
- return restring
+
def findDeps(self, pkgs):
"""Return the dependencies for a given package object list, as well
@@ -1127,7 +1115,7 @@
for string in criteria:
- restring = self._refineSearchPattern(string)
+ restring = misc.refineSearchPattern(string)
try: crit_re = re.compile(restring, flags=re.I)
except sre_constants.error, e:
raise Errors.MiscError, \
@@ -1149,7 +1137,7 @@
for po in self.rpmdb: # this is more expensive so this is the top op
tmpvalues = []
for string in criteria:
- restring = self._refineSearchPattern(string)
+ restring = misc.refineSearchPattern(string)
try: crit_re = re.compile(restring, flags=re.I)
except sre_constants.error, e:
@@ -1233,7 +1221,7 @@
'Searching %d packages', len(where))
self.verbose_logger.log(logginglevels.DEBUG_1,
'refining the search expression of %s', arg)
- restring = self._refineSearchPattern(arg)
+ restring = misc.refineSearchPattern(arg)
self.verbose_logger.log(logginglevels.DEBUG_1,
'refined search: %s', restring)
try:
@@ -1271,7 +1259,7 @@
taglist = ['filenames', 'dirnames', 'providesnames']
arg_re = []
for arg in args:
- restring = self._refineSearchPattern(arg)
+ restring = misc.refineSearchPattern(arg)
try: reg = re.compile(restring, flags=re.I)
except sre_constants.error, e:
@@ -1571,7 +1559,7 @@
try:
pkglist = self.returnPackagesByDep(depstring)
- except Errors.YumBaseError, e:
+ except Errors.YumBaseError:
raise Errors.YumBaseError, 'No Package found for %s' % depstring
result = self._bestPackageFromList(pkglist)
@@ -1599,7 +1587,7 @@
if re.search('[>=<]', depstring): # versioned
try:
depname, flagsymbol, depver = depstring.split()
- except ValueError, e:
+ except ValueError:
raise Errors.YumBaseError, 'Invalid versioned dependency string, try quoting it.'
if not SYMBOLFLAGS.has_key(flagsymbol):
raise Errors.YumBaseError, 'Invalid version flag'
Index: misc.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/misc.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- misc.py 8 Sep 2006 13:32:51 -0000 1.18
+++ misc.py 8 Sep 2006 16:21:32 -0000 1.19
@@ -10,6 +10,7 @@
import tempfile
import glob
import pwd
+import fnmatch
from stat import *
from Errors import MiscError
@@ -308,19 +309,31 @@
return ret
def prco_tuple_to_string(prcoTuple):
- """returns a text string of the prco from the tuple format"""
-
- (name, flag, (e, v, r)) = prcoTuple
- flags = {'GT':'>', 'GE':'>=', 'EQ':'=', 'LT':'<', 'LE':'<='}
- if flag is None:
- return name
-
- base = '%s %s ' % (name, flags[flag])
- if e not in [0, '0', None]:
- base += '%s:' % e
- if v is not None:
- base += '%s' % v
- if r is not None:
- base += '-%s' % r
+ """returns a text string of the prco from the tuple format"""
+
+ (name, flag, (e, v, r)) = prcoTuple
+ flags = {'GT':'>', 'GE':'>=', 'EQ':'=', 'LT':'<', 'LE':'<='}
+ if flag is None:
+ return name
+
+ base = '%s %s ' % (name, flags[flag])
+ if e not in [0, '0', None]:
+ base += '%s:' % e
+ if v is not None:
+ base += '%s' % v
+ if r is not None:
+ base += '-%s' % r
+
+ return base
+
+def refineSearchPattern(arg):
+ """Takes a search string from the cli for Search or Provides
+ and cleans it up so it doesn't make us vomit"""
+
+ if re.match('.*[\*,\[,\],\{,\},\?,\+].*', arg):
+ restring = fnmatch.translate(arg)
+ else:
+ restring = re.escape(arg)
- return base
+ return restring
+
Index: packages.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/packages.py,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- packages.py 8 Sep 2006 13:32:52 -0000 1.65
+++ packages.py 8 Sep 2006 16:21:32 -0000 1.66
@@ -492,11 +492,11 @@
self.licenses.append(infodict['license'])
if hasattr(pkgdict, 'files'):
- for file in pkgdict.files.keys():
- ftype = pkgdict.files[file]
+ for fn in pkgdict.files.keys():
+ ftype = pkgdict.files[fn]
if not self.files.has_key(ftype):
self.files[ftype] = []
- self.files[ftype].append(file)
+ self.files[ftype].append(fn)
if hasattr(pkgdict, 'prco'):
for rtype in pkgdict.prco.keys():
@@ -569,15 +569,15 @@
for tag in ['OBSOLETE', 'CONFLICT', 'REQUIRE', 'PROVIDE']:
name = self.hdr[getattr(rpm, 'RPMTAG_%sNAME' % tag)]
- list = self.hdr[getattr(rpm, 'RPMTAG_%sFLAGS' % tag)]
+ lst = self.hdr[getattr(rpm, 'RPMTAG_%sFLAGS' % tag)]
flag = []
- for i in list:
+ for i in lst:
value = rpmUtils.miscutils.flagToString(i)
flag.append(value)
- list = self.hdr[getattr(rpm, 'RPMTAG_%sVERSION' % tag)]
+ lst = self.hdr[getattr(rpm, 'RPMTAG_%sVERSION' % tag)]
vers = []
- for i in list:
+ for i in lst:
value = rpmUtils.miscutils.stringToVersion(i)
vers.append(value)
@@ -588,7 +588,7 @@
def tagByName(self, tag):
try:
data = self.hdr[tag]
- except KeyError, e:
+ except KeyError:
raise Errors.MiscError, "Unknown header tag %s" % tag
return data
@@ -618,12 +618,12 @@
filemodes = self.tagByName('filemodes')
filetuple = zip(files, filemodes, fileflags)
if not self._loadedfiles:
- for (file, mode, flag) in filetuple:
+ for (fn, mode, flag) in filetuple:
#garbage checks
if mode is None or mode == '':
if not self.files.has_key('file'):
self.files['file'] = []
- self.files['file'].append(file)
+ self.files['file'].append(fn)
continue
if not self.__mode_cache.has_key(mode):
self.__mode_cache[mode] = stat.S_ISDIR(mode)
@@ -631,21 +631,21 @@
if self.__mode_cache[mode]:
if not self.files.has_key('dir'):
self.files['dir'] = []
- self.files['dir'].append(file)
+ self.files['dir'].append(fn)
else:
if flag is None:
if not self.files.has_key('file'):
self.files['file'] = []
- self.files['file'].append(file)
+ self.files['file'].append(fn)
else:
if (flag & 64):
if not self.files.has_key('ghost'):
self.files['ghost'] = []
- self.files['ghost'].append(file)
+ self.files['ghost'].append(fn)
continue
if not self.files.has_key('file'):
self.files['file'] = []
- self.files['file'].append(file)
+ self.files['file'].append(fn)
self._loadedfiles = True
def returnFileEntries(self, ftype='file'):
@@ -689,7 +689,7 @@
try:
hdr = rpmUtils.miscutils.hdrFromPackage(ts, self.localpath)
- except RpmUtilsError, e:
+ except RpmUtilsError:
raise Errors.MiscError, \
'Could not open local rpm file: %s' % self.localpath
More information about the Yum-cvs-commits
mailing list