[pypy-svn] r37224 - pypy/dist/pypy/config

[cfbolz at codespeak.net]

Author: cfbolz
Date: Tue Jan 23 19:15:53 2007
New Revision: 37224

Modified:
   pypy/dist/pypy/config/config.py
Log:
reorder classes so that all the (less important) optparse stuff is grouped
together


Modified: pypy/dist/pypy/config/config.py
==============================================================================
--- pypy/dist/pypy/config/config.py	(original)
+++ pypy/dist/pypy/config/config.py	Tue Jan 23 19:15:53 2007
@@ -214,48 +214,6 @@
                                    callback=callback, metavar=self._name.upper(),
                                    *argnames)
 
-
-class ConfigUpdate(object):
-
-    def __init__(self, config, option):
-        self.config = config
-        self.option = option
-
-    def convert_from_cmdline(self, value):
-        return self.option.convert_from_cmdline(value)
-
-    def __call__(self, option, opt_str, value, parser, *args, **kwargs):
-        try:
-            value = self.convert_from_cmdline(value)
-            self.config.setoption(self.option._name, value, who='cmdline')
-        except ValueError, e:
-            raise optparse.OptionValueError(e.args[0])
-
-    def help_default(self):
-        default = getattr(self.config, self.option._name)
-        owner = self.config._cfgimpl_value_owners[self.option._name]
-        if default is None:
-            if owner == 'default':
-                return ''
-            else:
-                default = '???'
-        return "%s: %s" % (owner, default)
-
-class BoolConfigUpdate(ConfigUpdate):
-    def __init__(self, config, option, which_value):
-        super(BoolConfigUpdate, self).__init__(config, option)
-        self.which_value = which_value
-
-    def convert_from_cmdline(self, value):
-        return self.which_value
-
-    def help_default(self):
-        default = getattr(self.config, self.option._name)
-        owner = self.config._cfgimpl_value_owners[self.option._name]
-        if default == self.which_value:
-            return owner
-        else:
-            return ""
         
 class ChoiceOption(Option):
     opt_type = 'string'
@@ -357,6 +315,7 @@
         except TypeError, e:
             raise ValueError(*e.args)
 
+
 class FloatOption(Option):
     opt_type = 'float'
 
@@ -377,6 +336,7 @@
         except TypeError, e:
             raise ValueError(*e.args)
 
+
 class StrOption(Option):
     opt_type = 'string'
     
@@ -393,6 +353,7 @@
         except TypeError, e:
             raise ValueError(*e.args)
 
+
 class ArbitraryOption(Option):
     def __init__(self, name, doc, default=None, defaultfactory=None):
         super(ArbitraryOption, self).__init__(name, doc, cmdline=None)
@@ -412,6 +373,7 @@
             return self.defaultfactory()
         return self.default
 
+
 class OptionDescription(object):
     __metaclass__ = extendabletype
 
@@ -479,6 +441,51 @@
 
         return option.help
 
+
+class ConfigUpdate(object):
+
+    def __init__(self, config, option):
+        self.config = config
+        self.option = option
+
+    def convert_from_cmdline(self, value):
+        return self.option.convert_from_cmdline(value)
+
+    def __call__(self, option, opt_str, value, parser, *args, **kwargs):
+        try:
+            value = self.convert_from_cmdline(value)
+            self.config.setoption(self.option._name, value, who='cmdline')
+        except ValueError, e:
+            raise optparse.OptionValueError(e.args[0])
+
+    def help_default(self):
+        default = getattr(self.config, self.option._name)
+        owner = self.config._cfgimpl_value_owners[self.option._name]
+        if default is None:
+            if owner == 'default':
+                return ''
+            else:
+                default = '???'
+        return "%s: %s" % (owner, default)
+
+
+class BoolConfigUpdate(ConfigUpdate):
+    def __init__(self, config, option, which_value):
+        super(BoolConfigUpdate, self).__init__(config, option)
+        self.which_value = which_value
+
+    def convert_from_cmdline(self, value):
+        return self.which_value
+
+    def help_default(self):
+        default = getattr(self.config, self.option._name)
+        owner = self.config._cfgimpl_value_owners[self.option._name]
+        if default == self.which_value:
+            return owner
+        else:
+            return ""
+
+
 def to_optparse(config, useoptions=None, parser=None,
                 parserargs=None, parserkwargs=None):
     grps = {}
@@ -528,6 +535,7 @@
             option.add_optparse_option(chunks, grp, homeconf)
     return parser
 
+
 def make_dict(config):
     paths = config.getpaths()
     options = dict([(path, getattr(config, path)) for path in paths])