[gentoo-commits] proj/layman:overlord_merge commit in: layman/

["Brian Dolbec" <brian.dolbec@gmail.com>]

commit:     503c1586ac80109089f0bf6d0a1a0a579a19a6d7
Author:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
AuthorDate: Mon Feb 14 00:49:30 2011 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Mon Feb 14 00:49:30 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/layman.git;a=commit;h=503c1586

fix a missed color_off(), add myself to the copyright, whitespace cleaning

---
 layman/config.py |   17 +++++++----------
 1 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/layman/config.py b/layman/config.py
index e515155..6f8f658 100644
--- a/layman/config.py
+++ b/layman/config.py
@@ -10,6 +10,7 @@
 # Copyright:
 #             (c) 2005 - 2009 Gunnar Wrobel
 #             (c) 2009        Sebastian Pipping
+#             (c) 2010 - 2011 Brian Dolbec
 #             Distributed under the terms of the GNU General Public License v2
 #
 # Author(s):
@@ -30,18 +31,14 @@ __version__ = "$Id: config.py 286 2007-01-09 17:48:23Z wrobel $"
 import sys, ConfigParser
 import os
 
-from   optparse                 import OptionParser, OptionGroup
+from optparse import OptionParser, OptionGroup
 
-#from   layman.debug             import OUT
-from   layman.output            import OUT
+#from layman.debug import OUT
+from layman.output import OUT
 
-from   layman.version           import VERSION
+from layman.constants import OFF
+from layman.version import VERSION
 
-#===============================================================================
-#
-# Class Config
-#
-#-------------------------------------------------------------------------------
 
 _USAGE = """
   layman (-a|-d|-s|-i) (OVERLAY|ALL)
@@ -375,7 +372,7 @@ class ArgsParser(object):
 
 
         if self.options.__dict__['nocolor']:
-            self.output.color_off()
+            self.output.set_colorize(OFF)
 
         # Fetch only an alternate config setting from the options
         if not self.options.__dict__['config'] is None: