[gnue] r8327 - trunk/gnue-common/src/apps

[reinhard]

Author: reinhard
Date: 2006-03-31 15:27:33 -0600 (Fri, 31 Mar 2006)
New Revision: 8327

Modified:
   trunk/gnue-common/src/apps/GConfig.py
Log:
Allow for both unicode and 8bit strings for config option descriptions.


Modified: trunk/gnue-common/src/apps/GConfig.py
===================================================================
--- trunk/gnue-common/src/apps/GConfig.py       2006-03-31 21:11:51 UTC (rev 
8326)
+++ trunk/gnue-common/src/apps/GConfig.py       2006-03-31 21:27:33 UTC (rev 
8327)
@@ -27,11 +27,14 @@
 #
 
 from ConfigParser import *
-import os, sys, string
+import os
+import string
+import sys
+import textwrap
+
 from gnue import paths
-from gnue.common.apps import errors, GDebug
+from gnue.common.apps import i18n, errors, GDebug
 from gnue.common.utils.FileUtils import openResource
-from gnue.common.utils.TextUtils import lineWrap
 from gnue.common import GCConfig
 import copy
 
@@ -244,7 +247,11 @@
       nameString = "Name:%s" % option['Name']
       defaultString = "Default Value:%s" % option['Default']
       output += "%s%s%s\n" %(nameString, ' ' * (outputWidth - len(nameString + 
defaultString)), defaultString)
-      output += "%s\n" % lineWrap(option['Description'], outputWidth)
+      # FIXME: This allows for non-unicode descriptions. Remove at some point.
+      description = option['Description']
+      if isinstance(description, str):
+        description = unicode(description, i18n.getencoding())
+      output += "%s\n" % textwrap.fill(description, outputWidth)
   else:
     output += "No options defined"
   return output