[PATCH 34/34] Fix miscellaneous errors in installclass.py.
Chris Lumens
clumens at redhat.com
Mon Aug 12 20:33:10 UTC 2013
This has got to be among our oldest, cruftiest code at this point.
---
pyanaconda/installclass.py | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/pyanaconda/installclass.py b/pyanaconda/installclass.py
index 1fde1a8..b1db1b8 100644
--- a/pyanaconda/installclass.py
+++ b/pyanaconda/installclass.py
@@ -117,8 +117,8 @@ def availableClasses(showHidden=0):
global allClasses_hidden
def _ordering(first, second):
- ((name1, obj), priority1) = first
- ((name2, obj), priority2) = second
+ ((name1, _), priority1) = first
+ ((name2, _), priority2) = second
if priority1 < priority2:
return -1
@@ -133,9 +133,11 @@ def availableClasses(showHidden=0):
return 0
if not showHidden:
- if allClasses: return allClasses
+ if allClasses:
+ return allClasses
else:
- if allClasses_hidden: return allClasses_hidden
+ if allClasses_hidden:
+ return allClasses_hidden
path = []
@@ -191,17 +193,17 @@ def availableClasses(showHidden=0):
if obj.hidden == 0 or showHidden == 1:
lst.append(((obj.name, obj), sortOrder))
- except ImportError as e:
+ except ImportError:
log.warning ("module import of %s failed: %s" % (mainName, sys.exc_type))
if flags.debug: raise
else: continue
lst.sort(_ordering)
- for (item, priority) in lst:
+ for (item, _) in lst:
if showHidden:
- allClasses_hidden.append(item)
+ allClasses_hidden += [item]
else:
- allClasses.append(item)
+ allClasses += [item]
if showHidden:
return allClasses_hidden
--
1.8.1.2
More information about the anaconda-patches
mailing list