[Python-modules-commits] r9035 - in packages/tagpy/trunk/debian (2 files)

[nijel at users.alioth.debian.org]

    Date: Tuesday, July 14, 2009 @ 14:15:44
  Author: nijel
Revision: 9035

Refresh optional-siteconf.patch.

Modified:
  packages/tagpy/trunk/debian/changelog
  packages/tagpy/trunk/debian/patches/optional-siteconf.patch

Modified: packages/tagpy/trunk/debian/changelog
===================================================================
--- packages/tagpy/trunk/debian/changelog	2009-07-14 14:14:08 UTC (rev 9034)
+++ packages/tagpy/trunk/debian/changelog	2009-07-14 14:15:44 UTC (rev 9035)
@@ -1,8 +1,9 @@
 tagpy (0.94.6-1) unstable; urgency=low
 
   * New upstream version.
+  * Refresh optional-siteconf.patch.
 
- -- Michal ÄŒihaÅ™ <nijel at debian.org>  Tue, 14 Jul 2009 16:14:03 +0200
+ -- Michal ÄŒihaÅ™ <nijel at debian.org>  Tue, 14 Jul 2009 16:15:33 +0200
 
 tagpy (0.94.5-5) unstable; urgency=low
 

Modified: packages/tagpy/trunk/debian/patches/optional-siteconf.patch
===================================================================
--- packages/tagpy/trunk/debian/patches/optional-siteconf.patch	2009-07-14 14:14:08 UTC (rev 9034)
+++ packages/tagpy/trunk/debian/patches/optional-siteconf.patch	2009-07-14 14:15:44 UTC (rev 9035)
@@ -13,122 +13,12 @@
  
  ez_setup.use_setuptools()
  
-@@ -24,7 +29,7 @@
+@@ -223,7 +228,7 @@
  
  
- class NumpyExtension(Extension):
--    # nicked from 
-+    # nicked from
-     # http://mail.python.org/pipermail/distutils-sig/2007-September/008253.html
-     # solution by Michael Hoffmann
-     def __init__(self, *args, **kwargs):
-@@ -65,7 +70,7 @@
- 
- # tools -----------------------------------------------------------------------
- def flatten(list):
--    """For an iterable of sub-iterables, generate each member of each 
-+    """For an iterable of sub-iterables, generate each member of each
-     sub-iterable in turn, i.e. a flattened version of that super-iterable.
- 
-     Example: Turn [[a,b,c],[d,e,f]] into [a,b,c,d,e,f].
-@@ -161,7 +166,7 @@
- 
- 
  class ConfigSchema:
 -    def __init__(self, options, conf_file="siteconf.py", conf_dir="."):
 +    def __init__(self, options, conf_file=DEFAULT_SITECONF, conf_dir="."):
          self.optdict = dict((opt.name, opt) for opt in options)
          self.options = options
          self.conf_dir = conf_dir
-@@ -184,9 +189,9 @@
-         self.conf_dir = conf_dir
- 
-     def get_default_config(self):
--        return dict((opt.name, opt.default) 
-+        return dict((opt.name, opt.default)
-                 for opt in self.options)
--        
-+
-     def read_config_from_pyfile(self, filename):
-         result = {}
-         filevars = {}
-@@ -234,7 +239,7 @@
-         result = self.get_default_config()
- 
-         import os
--        
-+
-         confignames = []
-         if self.global_conf_file is not None:
-             confignames.append(self.global_conf_file)
-@@ -248,7 +253,7 @@
- 
-     def have_global_config(self):
-         import os
--        return (os.access(self.user_conf_file, os.R_OK) or 
-+        return (os.access(self.user_conf_file, os.R_OK) or
-                 os.access(self.global_conf_file, os.R_OK))
- 
-     def have_config(self):
-@@ -330,13 +335,13 @@
-         return result
- 
-     def value_to_str(self, default):
--        return default 
-+        return default
- 
-     def add_to_configparser(self, parser, default=None):
-         default = default_or(default, self.default)
-         default_str = self.value_to_str(default)
-         parser.add_option(
--            "--" + self.as_option(), dest=self.name, 
-+            "--" + self.as_option(), dest=self.name,
-             default=default_str,
-             metavar=self.metavar(), help=self.get_help(default))
- 
-@@ -357,11 +362,11 @@
-             action = "store_false"
-         else:
-             action = "store_true"
--            
-+
-         parser.add_option(
--            "--" + self.as_option(), 
--            dest=self.name, 
--            help=self.get_help(default), 
-+            "--" + self.as_option(),
-+            dest=self.name,
-+            help=self.get_help(default),
-             default=default,
-             action=action)
- 
-@@ -389,7 +394,7 @@
- class IncludeDir(StringListOption):
-     def __init__(self, lib_name, default=None, human_name=None, help=None):
-         StringListOption.__init__(self, "%s_INC_DIR" % lib_name, default,
--                help=help or ("Include directories for %s" 
-+                help=help or ("Include directories for %s"
-                 % (human_name or humanize(lib_name))))
- 
- class LibraryDir(StringListOption):
-@@ -401,7 +406,7 @@
- class Libraries(StringListOption):
-     def __init__(self, lib_name, default=None, human_name=None, help=None):
-         StringListOption.__init__(self, "%s_LIBNAME" % lib_name, default,
--                help=help or ("Library names for %s (without lib or .so)" 
-+                help=help or ("Library names for %s (without lib or .so)"
-                 % (human_name or humanize(lib_name))))
- 
- 
-@@ -435,9 +440,9 @@
- 	    help="Ignored")
-     parser.add_option("--enable-shared", help="Ignored", action="store_false")
-     parser.add_option("--disable-static", help="Ignored", action="store_false")
--    parser.add_option("--update-user", help="Update user config file (%s)" % schema.user_conf_file, 
-+    parser.add_option("--update-user", help="Update user config file (%s)" % schema.user_conf_file,
-             action="store_true")
--    parser.add_option("--update-global", help="Update global config file (%s)" % schema.global_conf_file, 
-+    parser.add_option("--update-global", help="Update global config file (%s)" % schema.global_conf_file,
-             action="store_true")
- 
-     schema.add_to_configparser(parser, schema.read_config())