migrate to using explicit checks.

14 files changed, 25 insertions, 25 deletions

diff --git a/layman/api.py b/layman/api.py
index 11fef62..cbb9d99 100644
--- a/layman/api.py
+++ b/layman/api.py
@@ -49,7 +49,7 @@ class LaymanAPI(object):
                                     default is Message(module='layman') other params are defaults.
         """
 
-        self.config = config if config else BareConfig(output=output)
+        self.config = config if config is not None else BareConfig(output=output)
 
         self.output = self.config['output']
 
@@ -433,7 +433,7 @@ class LaymanAPI(object):
         @rtype: list
         @return: list of error strings
         """
-        if self._error_messages:
+        if len(self._error_messages):
             messages =  self._error_messages[:]
             self._error_messages = []
             return messages
diff --git a/layman/argsparser.py b/layman/argsparser.py
index 708b1f8..9b6aa91 100644
--- a/layman/argsparser.py
+++ b/layman/argsparser.py
@@ -272,7 +272,7 @@ class ArgsParser(BareConfig):
                 overlays = '\n'.join(self.options.__dict__[key])
             if self.config.has_option('MAIN', 'overlays'):
                 overlays += '\n' + self.config.get('MAIN', 'overlays')
-            if overlays:
+            if len(overlays):
                 return  overlays
 
         self.output.debug('Retrieving option', 8)
diff --git a/layman/db.py b/layman/db.py
index 6e3cba4..aaba2b7 100644
--- a/layman/db.py
+++ b/layman/db.py
@@ -240,7 +240,7 @@ class RemoteDB(DbBase):
             opener = urllib2.build_opener(proxy_handler)
             urllib2.install_opener(opener)
 
-        self.urls  = [i.strip() for i in config['overlays'].split('\n') if i]
+        self.urls  = [i.strip() for i in config['overlays'].split('\n') if len(i)]
 
         paths = [self.path(i) for i in self.urls]
 
diff --git a/layman/dbbase.py b/layman/dbbase.py
index 5c45cb1..70d0cfa 100644
--- a/layman/dbbase.py
+++ b/layman/dbbase.py
@@ -164,9 +164,9 @@ class DbBase:
         '''Reads xml text and dictionary definitions and adds
         them to the db.
         '''
-        if xml:
+        if xml is not None:
             self.read(xml, origin)
-        if from_dict:
+        if from_dict is not None:
             self.output.info("DbBase: add_new() from_dict")
             if isinstance(from_dict, dict):
                 from_dict = [from_dict]
@@ -272,7 +272,7 @@ class DbBase:
         result = []
 
         selection = [overlay for (a, overlay) in self.overlays.items()]
-        if repos:
+        if repos is not None:
             selection = [overlay for overlay in selection if overlay.name in repos]
 
         for overlay in selection:
diff --git a/layman/overlays/bzr.py b/layman/overlays/bzr.py
index 957f9e7..ec57a7b 100644
--- a/layman/overlays/bzr.py
+++ b/layman/overlays/bzr.py
@@ -55,7 +55,7 @@ class BzrOverlay(OverlaySource):
         target = path([base, self.parent.name])
 
         # bzr get SOURCE TARGET
-        if cfg_opts:
+        if len(cfg_opts):
             args = ['get', cfg_opts,
                 self.src + '/', target]
         else:
@@ -73,7 +73,7 @@ class BzrOverlay(OverlaySource):
         target = path([base, self.parent.name])
 
         # bzr pull --overwrite SOURCE
-        if cfg_opts:
+        if len(cfg_opts):
             args = ['pull', cfg_opts, '--overwrite', self.src]
         else:
             args = ['pull', '--overwrite', self.src]
diff --git a/layman/overlays/cvs.py b/layman/overlays/cvs.py
index 69e0dd1..15a6c97 100644
--- a/layman/overlays/cvs.py
+++ b/layman/overlays/cvs.py
@@ -76,7 +76,7 @@ class CvsOverlay(OverlaySource):
             args.append('-q')
         args.append('co')
         args.append('-d')
-        if cfg_opts:
+        if len(cfg_opts):
             args.append(cfg_opts)
         args.append(self.parent.name)
         args.append(self.subpath)
@@ -100,7 +100,7 @@ class CvsOverlay(OverlaySource):
             args.append('-q')
         args.append('update')
         args.append('-d')
-        if cfg_opts:
+        if len(cfg_opts):
             args.append(cfg_opts)
         return self.postsync(
             self.run_command(self.command(), *args, cwd=target, cmd=self.type),
diff --git a/layman/overlays/darcs.py b/layman/overlays/darcs.py
index 14a415b..358db2d 100644
--- a/layman/overlays/darcs.py
+++ b/layman/overlays/darcs.py
@@ -54,7 +54,7 @@ class DarcsOverlay(OverlaySource):
         target = path([base, self.parent.name])
 
         # darcs get --partial SOURCE TARGET
-        if cfg_opts:
+        if len(cfg_opts):
             args = ['get', '--partial', cfg_opts,
                 self.src + '/', target]
         else:
@@ -74,7 +74,7 @@ class DarcsOverlay(OverlaySource):
         target = path([base, self.parent.name])
 
         # darcs pull --all SOURCE
-        if cfg_opts:
+        if len(cfg_opts):
             args = ['pull', '--all', cfg_opts, self.src]
         else:
             args = ['pull', '--all', self.src]
diff --git a/layman/overlays/git.py b/layman/overlays/git.py
index d65a5d3..1825f92 100644
--- a/layman/overlays/git.py
+++ b/layman/overlays/git.py
@@ -62,7 +62,7 @@ class GitOverlay(OverlaySource):
         args = ['clone']
         if quiet:
             args.append('-q')
-        if cfg_opts:
+        if len(cfg_opts):
             args.append(cfg_opts)
         args.append(fix_git_source(self.src))
         args.append(target)
@@ -81,7 +81,7 @@ class GitOverlay(OverlaySource):
         args = ['pull']
         if quiet:
             args.append('-q')
-        if cfg_opts:
+        if len(cfg_opts):
             args.append(cfg_opts)
         return self.postsync(
             self.run_command(self.command(), *args, cwd=target, cmd=self.type),
diff --git a/layman/overlays/mercurial.py b/layman/overlays/mercurial.py
index 748588b..c6a9fce 100644
--- a/layman/overlays/mercurial.py
+++ b/layman/overlays/mercurial.py
@@ -55,7 +55,7 @@ class MercurialOverlay(OverlaySource):
         target = path([base, self.parent.name])
 
         # hg clone SOURCE TARGET
-        if cfg_opts:
+        if len(cfg_opts):
             args = ['clone', cfg_opts, self.src + '/', target]
         else:
             args = ['clone', self.src + '/', target]
@@ -73,7 +73,7 @@ class MercurialOverlay(OverlaySource):
         target = path([base, self.parent.name])
 
         # hg pull -u SOURCE
-        if cfg_opts:
+        if len(cfg_opts):
             args = ['pull', '-u', cfg_opts, self.src]
         else:
             args = ['pull', '-u', self.src]
diff --git a/layman/overlays/overlay.py b/layman/overlays/overlay.py
index 9486c38..9d2006b 100644
--- a/layman/overlays/overlay.py
+++ b/layman/overlays/overlay.py
@@ -143,7 +143,7 @@ class Overlay(object):
             return _class(parent=self, config=self.config,
                 _location=_location, ignore=ignore, quiet=quiet)
 
-        if not _sources:
+        if not len(_sources):
             raise Exception('Overlay "' + self.name + \
                 '" is missing a "source" entry!')
 
diff --git a/layman/overlays/rsync.py b/layman/overlays/rsync.py
index 76b289e..d282b35 100644
--- a/layman/overlays/rsync.py
+++ b/layman/overlays/rsync.py
@@ -69,7 +69,7 @@ class RsyncOverlay(OverlaySource):
 
         if quiet:
             args.append('-q')
-        if cfg_opts:
+        if len(cfg_opts):
             args.append(cfg_opts)
         args.append(self.src + '/')
         args.append(target)
diff --git a/layman/overlays/source.py b/layman/overlays/source.py
index 458f627..a845266 100644
--- a/layman/overlays/source.py
+++ b/layman/overlays/source.py
@@ -126,10 +126,10 @@ class OverlaySource(object):
             env.update(env_updates)
 
         command_repr = ' '.join(args)
-        if env_updates:
+        if env_updates is not None:
             command_repr = '%s %s' % (' '.join('%s=%s' % (k, v) for (k, v)
                 in sorted(env_updates.items())), command_repr)
-        if cwd:
+        if cwd is not None:
             command_repr = '( cd %s  && %s )' % (cwd, command_repr)
 
         cmd = kwargs.get('cmd', '')
@@ -176,7 +176,7 @@ class OverlaySource(object):
             return failed_sync
         # good to continue
         postsync_opt = self.config['%s_postsync' % self.__class__.type_key]
-        if postsync_opt:
+        if len(postsync_opt):
             # repalce "%cwd=" while it's still a string'
             _opt = postsync_opt.replace('%cwd=',
                 kwargs.get('cwd', '')).split()
diff --git a/layman/overlays/svn.py b/layman/overlays/svn.py
index e0eb632..6b124a3 100644
--- a/layman/overlays/svn.py
+++ b/layman/overlays/svn.py
@@ -58,7 +58,7 @@ class SvnOverlay(OverlaySource):
         args = ['co']
         if quiet:
             args.append('-q')
-        if cfg_opts:
+        if len(cfg_opts):
             args.append(cfg_opts)
         args.append(self.src + '/@')
         args.append(target)
@@ -87,7 +87,7 @@ class SvnOverlay(OverlaySource):
         args = ['up']
         if quiet:
             args.append('-q')
-        if cfg_opts:
+        if len(cfg_opts):
             args.append(cfg_opts)
         args.append(target)
 
diff --git a/layman/utils.py b/layman/utils.py
index 03ddb45..e38ea7c 100644
--- a/layman/utils.py
+++ b/layman/utils.py
@@ -50,7 +50,7 @@ def decode_selection(selection):
     # fix None passed in, return an empty list
     selection = selection or []
     enc = sys.getfilesystemencoding()
-    if enc:
+    if enc is not None:
         return [i.decode(enc) for i in selection]
     return selection