[gentoo-commits] proj/layman:master commit in: layman/overlays/

[Brian Dolbec]

commit:     eab52f261bda8aef53675271357b3ca742f865ad
Author:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
AuthorDate: Sun Mar 27 07:14:16 2011 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Sun Mar 27 07:14:16 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/layman.git;a=commit;h=eab52f26

migrate to explicit if check

---
 layman/overlays/overlay.py |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/layman/overlays/overlay.py b/layman/overlays/overlay.py
index b99c052..9486c38 100644
--- a/layman/overlays/overlay.py
+++ b/layman/overlays/overlay.py
@@ -101,9 +101,9 @@ class Overlay(object):
         self.output = config['output']
         self._encoding_ = get_encoding(self.output)
 
-        if xml:
+        if xml is not None:
             self.from_xml(xml, ignore, quiet)
-        elif ovl_dict:
+        elif ovl_dict is not None:
             self.from_dict(ovl_dict, ignore, quiet)
 
 
@@ -125,7 +125,7 @@ class Overlay(object):
             raise Exception('Overlay is missing a "name" entry!')
 
         _sources = xml.findall('source')
-        if _sources:
+        if _sources != None:
             _sources = [e for e in _sources if 'type' in e.attrib]
         elif ('src' in xml.attrib) and ('type' in xml.attrib):
             s = ET.Element('source', type=xml.attrib['type'])
@@ -242,7 +242,7 @@ class Overlay(object):
 
         _sources = overlay['sources']
 
-        if not _sources:
+        if _sources == None:
             raise Exception('Overlay "' + self.name +
                 '" is missing a "source" entry!')
 
@@ -296,7 +296,7 @@ class Overlay(object):
             self.status = None
 
         self.quality = u'experimental'
-        if overlay['quality']:
+        if len(overlay['quality']):
             if overlay['quality'] in set(QUALITY_LEVELS):
                 self.quality = ensure_unicode(overlay['quality'])
 
@@ -485,7 +485,7 @@ class Overlay(object):
         if self.irc != None:
             result += u'\nIRC : ' + self.irc + u'\n'
 
-        if self.feeds:
+        if len(self.feeds):
             result += u'\n%s:' % ((len(self.feeds) == 1) and "Feed" or "Feeds")
             for i in self.feeds:
                 result += u'\n  %s' % i