Merge lp:~logan/ubuntu/quantal/zconfig/new-upstream into lp:ubuntu/quantal/zconfig

[Logan Rosen]

[Barry Warsaw (barry)]

Looks good, thanks! I will sponsor it. Please submit a bug in Debian for them to update to the latest version, and then create a bug in Launchpad that links to it. This way, we can resync to Debian when the new version is available there.

review: Approve

=== modified file 'NEWS.txt'
--- NEWS.txt	2011-03-24 18:29:45 +0000
+++ NEWS.txt	2012-07-15 23:54:18 +0000
@@ -3,6 +3,32 @@
 ==========================
 
 
+ZConfig 2.9.3 (2012-06-25)
+--------------------------
+
+- Fixed: port values of 0 weren't allowed.  Port 0 is used to request
+  an ephemeral port.
+
+ZConfig 2.9.2 (2012-02-11)
+--------------------------
+
+- Adjust test classes to avoid base classes being considered separate
+  test cases by (at least) the "nose" test runner.
+
+
+ZConfig 2.9.1 (2012-02-11)
+--------------------------
+
+- Make FileHandler.reopen thread safe.
+
+
+ZConfig 2.9.0 (2011-03-22)
+--------------------------
+
+- Allow identical redefinition of ``%define`` names.
+- Added support for IPv6 addresses.
+
+
 ZConfig 2.8.0 (2010-04-13)
 --------------------------
 
 
=== modified file 'PKG-INFO'
--- PKG-INFO	2011-03-24 18:29:45 +0000
+++ PKG-INFO	2012-07-15 23:54:18 +0000
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: ZConfig
-Version: 2.8.0
+Version: 2.9.3
 Summary: Structured Configuration Library
 Home-page: http://www.zope.org/Members/fdrake/zconfig/
 Author: Zope Foundation and Contributors
@@ -107,6 +107,32 @@
         ==========================
         
         
+        ZConfig 2.9.3 (2012-06-25)
+        --------------------------
+        
+        - Fixed: port values of 0 weren't allowed.  Port 0 is used to request
+          an ephemeral port.
+        
+        ZConfig 2.9.2 (2012-02-11)
+        --------------------------
+        
+        - Adjust test classes to avoid base classes being considered separate
+          test cases by (at least) the "nose" test runner.
+        
+        
+        ZConfig 2.9.1 (2012-02-11)
+        --------------------------
+        
+        - Make FileHandler.reopen thread safe.
+        
+        
+        ZConfig 2.9.0 (2011-03-22)
+        --------------------------
+        
+        - Allow identical redefinition of ``%define`` names.
+        - Added support for IPv6 addresses.
+        
+        
         ZConfig 2.8.0 (2010-04-13)
         --------------------------
         
@@ -320,4 +346,4 @@
 Classifier: Programming Language :: Python :: 2.4
 Classifier: Programming Language :: Python :: 2.5
 Classifier: Programming Language :: Python :: 2.6
-Classifier: Topic :: Software Development :: Libraries :: Python Modules
+Classifier: Programming Language :: Python :: 2.7
 
=== modified file 'ZConfig.egg-info/PKG-INFO'
--- ZConfig.egg-info/PKG-INFO	2011-03-24 18:29:45 +0000
+++ ZConfig.egg-info/PKG-INFO	2012-07-15 23:54:18 +0000
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: ZConfig
-Version: 2.8.0
+Version: 2.9.3
 Summary: Structured Configuration Library
 Home-page: http://www.zope.org/Members/fdrake/zconfig/
 Author: Zope Foundation and Contributors
@@ -107,6 +107,32 @@
         ==========================
         
         
+        ZConfig 2.9.3 (2012-06-25)
+        --------------------------
+        
+        - Fixed: port values of 0 weren't allowed.  Port 0 is used to request
+          an ephemeral port.
+        
+        ZConfig 2.9.2 (2012-02-11)
+        --------------------------
+        
+        - Adjust test classes to avoid base classes being considered separate
+          test cases by (at least) the "nose" test runner.
+        
+        
+        ZConfig 2.9.1 (2012-02-11)
+        --------------------------
+        
+        - Make FileHandler.reopen thread safe.
+        
+        
+        ZConfig 2.9.0 (2011-03-22)
+        --------------------------
+        
+        - Allow identical redefinition of ``%define`` names.
+        - Added support for IPv6 addresses.
+        
+        
         ZConfig 2.8.0 (2010-04-13)
         --------------------------
         
@@ -320,4 +346,4 @@
 Classifier: Programming Language :: Python :: 2.4
 Classifier: Programming Language :: Python :: 2.5
 Classifier: Programming Language :: Python :: 2.6
-Classifier: Topic :: Software Development :: Libraries :: Python Modules
+Classifier: Programming Language :: Python :: 2.7
 
=== modified file 'ZConfig/cfgparser.py'
--- ZConfig/cfgparser.py	2011-03-24 18:29:45 +0000
+++ ZConfig/cfgparser.py	2012-07-15 23:54:18 +0000
@@ -160,7 +160,8 @@
         if len(parts) == 2:
             defvalue = parts[1]
         if self.defines.has_key(defname):
-            self.error("cannot redefine " + `defname`)
+            if self.defines[defname] != defvalue:
+                self.error("cannot redefine " + `defname`)
         if not isname(defname):
             self.error("not a substitution legal name: " + `defname`)
         self.defines[defname] = self.replace(defvalue)
 
=== modified file 'ZConfig/components/basic/tests/test_mapping.py'
--- ZConfig/components/basic/tests/test_mapping.py	2011-03-24 18:29:45 +0000
+++ ZConfig/components/basic/tests/test_mapping.py	2012-07-15 23:54:18 +0000
@@ -15,10 +15,9 @@
 """Tests of the 'basic' section types provided as part of
 ZConfig.components.basic."""
 
+import ZConfig.tests.support
 import unittest
 
-from ZConfig.tests import support
-
 
 SIMPLE_SCHEMA = '''\
 <schema>
@@ -43,7 +42,9 @@
 '''
 
 
-class BasicSectionTypeTestCase(support.TestBase):
+class BasicSectionTypeTestCase(
+    ZConfig.tests.support.TestHelper, unittest.TestCase):
+
     schema = None
 
     def setUp(self):
 
=== modified file 'ZConfig/components/logger/loghandler.py'
--- ZConfig/components/logger/loghandler.py	2011-03-24 18:29:45 +0000
+++ ZConfig/components/logger/loghandler.py	2012-07-15 23:54:18 +0000
@@ -84,8 +84,12 @@
         _remove_from_reopenable(self._wr)
 
     def reopen(self):
-        self.stream.close()
-        self.stream = open(self.baseFilename, self.mode)
+        self.acquire()
+        try:
+            self.stream.close()
+            self.stream = open(self.baseFilename, self.mode)
+        finally:
+            self.release()
 
 
 class Win32FileHandler(FileHandler):
 
=== modified file 'ZConfig/components/logger/tests/test_logger.py'
--- ZConfig/components/logger/tests/test_logger.py	2011-03-24 18:29:45 +0000
+++ ZConfig/components/logger/tests/test_logger.py	2012-07-15 23:54:18 +0000
@@ -41,7 +41,10 @@
         return sio.getvalue() + "... Don't panic!"
 
 
-class LoggingTestBase(unittest.TestCase):
+class LoggingTestHelper:
+
+    # Not derived from unittest.TestCase; some test runners seem to
+    # think that means this class contains tests.
 
     # XXX This tries to save and restore the state of logging around
     # the test.  Somewhat surgical; there may be a better way.
@@ -100,7 +103,7 @@
         return conf
 
 
-class TestConfig(LoggingTestBase):
+class TestConfig(LoggingTestHelper, unittest.TestCase):
 
     _schematext = """
       <schema>
@@ -404,10 +407,12 @@
         return logger
 
 
-class TestReopeningLogfilesBase(LoggingTestBase):
+class TestReopeningRotatingLogfiles(LoggingTestHelper, unittest.TestCase):
 
     # These tests should not be run on Windows.
 
+    handler_factory = loghandler.RotatingFileHandler
+
     _schematext = """
       <schema>
         <import package='ZConfig.components.logger'/>
@@ -415,6 +420,40 @@
       </schema>
     """
 
+    _sampleconfig_template = """
+      <logger>
+        name  foo.bar
+        <logfile>
+          path  %(path0)s
+          level debug
+          max-size 1mb
+          old-files 10
+        </logfile>
+        <logfile>
+          path  %(path1)s
+          level info
+          max-size 1mb
+          old-files 3
+        </logfile>
+        <logfile>
+          path  %(path1)s
+          level info
+          when D
+          old-files 3
+        </logfile>
+      </logger>
+
+      <logger>
+        name  bar.foo
+        <logfile>
+          path  %(path2)s
+          level info
+          max-size 10mb
+          old-files 10
+        </logfile>
+      </logger>
+    """
+
     def test_filehandler_reopen(self):
 
         def mkrecord(msg):
@@ -458,7 +497,59 @@
         self.assert_("message 4" in text2)
         self.assert_("message 5" in text3)
 
-class TestReopeningLogfiles(TestReopeningLogfilesBase):
+    def test_logfile_reopening(self):
+        #
+        # This test only applies to the simple logfile reopening; it
+        # doesn't work the same way as the rotating logfile handler.
+        #
+        paths = self.mktemp(), self.mktemp(), self.mktemp()
+        d = {
+            "path0": paths[0],
+            "path1": paths[1],
+            "path2": paths[2],
+            }
+        text = self._sampleconfig_template % d
+        conf = self.get_config(text)
+        self.assertEqual(len(conf.loggers), 2)
+        # Build the loggers from the configuration, and write to them:
+        conf.loggers[0]().info("message 1")
+        conf.loggers[1]().info("message 2")
+        #
+        # We expect this to re-open the original filenames, so we'll
+        # have six files instead of three.
+        #
+        loghandler.reopenFiles()
+        #
+        # Write to them again:
+        conf.loggers[0]().info("message 3")
+        conf.loggers[1]().info("message 4")
+        #
+        # We expect this to re-open the original filenames, so we'll
+        # have nine files instead of six.
+        #
+        loghandler.reopenFiles()
+        #
+        # Write to them again:
+        conf.loggers[0]().info("message 5")
+        conf.loggers[1]().info("message 6")
+        #
+        # We should now have all nine files:
+        for fn in paths:
+            fn1 = fn + ".1"
+            fn2 = fn + ".2"
+            self.assert_(os.path.isfile(fn), "%r must exist" % fn)
+            self.assert_(os.path.isfile(fn1), "%r must exist" % fn1)
+            self.assert_(os.path.isfile(fn2), "%r must exist" % fn2)
+        #
+        # Clean up:
+        for logger in conf.loggers:
+            logger = logger()
+            for handler in logger.handlers[:]:
+                logger.removeHandler(handler)
+                handler.close()
+
+
+class TestReopeningLogfiles(TestReopeningRotatingLogfiles):
 
     handler_factory = loghandler.FileHandler
 
@@ -537,95 +628,23 @@
                 logger.removeHandler(handler)
                 handler.close()
 
-
-class TestReopeningRotatingLogfiles(TestReopeningLogfilesBase):
-
-    _sampleconfig_template = """
-      <logger>
-        name  foo.bar
-        <logfile>
-          path  %(path0)s
-          level debug
-          max-size 1mb
-          old-files 10
-        </logfile>
-        <logfile>
-          path  %(path1)s
-          level info
-          max-size 1mb
-          old-files 3
-        </logfile>
-        <logfile>
-          path  %(path1)s
-          level info
-          when D
-          old-files 3
-        </logfile>
-      </logger>
-
-      <logger>
-        name  bar.foo
-        <logfile>
-          path  %(path2)s
-          level info
-          max-size 10mb
-          old-files 10
-        </logfile>
-      </logger>
-    """
-
-    handler_factory = loghandler.RotatingFileHandler
-
-    def test_logfile_reopening(self):
-        #
-        # This test only applies to the simple logfile reopening; it
-        # doesn't work the same way as the rotating logfile handler.
-        #
-        paths = self.mktemp(), self.mktemp(), self.mktemp()
-        d = {
-            "path0": paths[0],
-            "path1": paths[1],
-            "path2": paths[2],
-            }
-        text = self._sampleconfig_template % d
-        conf = self.get_config(text)
-        self.assertEqual(len(conf.loggers), 2)
-        # Build the loggers from the configuration, and write to them:
-        conf.loggers[0]().info("message 1")
-        conf.loggers[1]().info("message 2")
-        #
-        # We expect this to re-open the original filenames, so we'll
-        # have six files instead of three.
-        #
-        loghandler.reopenFiles()
-        #
-        # Write to them again:
-        conf.loggers[0]().info("message 3")
-        conf.loggers[1]().info("message 4")
-        #
-        # We expect this to re-open the original filenames, so we'll
-        # have nine files instead of six.
-        #
-        loghandler.reopenFiles()
-        #
-        # Write to them again:
-        conf.loggers[0]().info("message 5")
-        conf.loggers[1]().info("message 6")
-        #
-        # We should now have all nine files:
-        for fn in paths:
-            fn1 = fn + ".1"
-            fn2 = fn + ".2"
-            self.assert_(os.path.isfile(fn), "%r must exist" % fn)
-            self.assert_(os.path.isfile(fn1), "%r must exist" % fn1)
-            self.assert_(os.path.isfile(fn2), "%r must exist" % fn2)
-        #
-        # Clean up:
-        for logger in conf.loggers:
-            logger = logger()
-            for handler in logger.handlers[:]:
-                logger.removeHandler(handler)
-                handler.close()
+    def test_filehandler_reopen_thread_safety(self):
+        # The reopen method needs to do locking to avoid a race condition
+        # with emit calls. For simplicity we replace the "acquire" and
+        # "release" methods with dummies that record calls to them.
+
+        fn = self.mktemp()
+        h = self.handler_factory(fn)
+
+        calls = []
+        h.acquire = lambda: calls.append("acquire")
+        h.release = lambda: calls.append("release")
+
+        h.reopen()
+        h.close()
+
+        self.assertEqual(calls, ["acquire", "release"])
+
 
 def test_logger_convenience_function_and_ommiting_name_to_get_root_logger():
     """
 
=== modified file 'ZConfig/datatypes.py'
--- ZConfig/datatypes.py	2011-03-24 18:29:45 +0000
+++ ZConfig/datatypes.py	2012-07-15 23:54:18 +0000
@@ -164,7 +164,7 @@
     return s.split()
 
 
-port_number = RangeCheckedConversion(integer, min=1, max=0xffff).__call__
+port_number = RangeCheckedConversion(integer, min=0, max=0xffff).__call__
 
 
 class InetAddress:
@@ -177,9 +177,17 @@
         host = ''
         port = None
         if ":" in s:
-            host, s = s.split(":", 1)
-            if s:
-                port = port_number(s)
+            host, p = s.rsplit(":", 1)
+            if host.startswith('[') and host.endswith(']'):
+                # [IPv6]:port
+                host = host[1:-1]
+            elif ':' in host:
+                # Unbracketed IPv6 address; 
+                # last part is not the port number
+                host = s
+                p = None
+            if p: # else leave port at None
+                port = port_number(p)
             host = host.lower()
         else:
             try:
@@ -203,6 +211,14 @@
 inet_binding_address = InetAddress("")
 
 class SocketAddress:
+    # Parsing results in family and address
+    # Family can be AF_UNIX (for addresses that are path names)
+    # or AF_INET6 (for inet addresses with colons in them)
+    # or AF_INET (for all other inet addresses); 
+    # An inet address is a (host, port) pair
+    # Notice that no DNS lookup is performed, so if the host
+    # is a DNS name, DNS lookup may end up with either IPv4 or
+    # IPv6 addresses, or both
     def __init__(self, s):
         import socket
         if "/" in s or s.find(os.sep) >= 0:
@@ -211,6 +227,8 @@
         else:
             self.family = socket.AF_INET
             self.address = self._parse_address(s)
+            if ':' in self.address[0]:
+                self.family = socket.AF_INET6
 
     def _parse_address(self, s):
         return inet_address(s)
@@ -237,15 +255,28 @@
         # IP address regex from the Perl Cookbook, Recipe 6.23 (revised ed.)
         # We allow underscores in hostnames although this is considered
         # illegal according to RFC1034.
+        # Addition: IPv6 addresses are now also accepted
         expr = (r"(^(\d|[01]?\d\d|2[0-4]\d|25[0-5])\." #ipaddr
                 r"(\d|[01]?\d\d|2[0-4]\d|25[0-5])\." #ipaddr cont'd
                 r"(\d|[01]?\d\d|2[0-4]\d|25[0-5])\." #ipaddr cont'd
                 r"(\d|[01]?\d\d|2[0-4]\d|25[0-5])$)" #ipaddr cont'd
-                r"|([A-Za-z_][-A-Za-z0-9_.]*[-A-Za-z0-9_])") # or hostname
+                r"|([A-Za-z_][-A-Za-z0-9_.]*[-A-Za-z0-9_])" # or hostname
+                r"|([0-9A-Fa-f:.]+:[0-9A-Fa-f:.]*)" # or superset of IPv6 addresses
+                                     # (requiring at least one colon)
+                ) 
         RegularExpressionConversion.__init__(self, expr)
 
     def __call__(self, value):
-        return RegularExpressionConversion.__call__(self, value).lower()
+        result = RegularExpressionConversion.__call__(self, value).lower()
+        # Use C library to validate IPv6 addresses, in particular wrt.
+        # number of colons and number of digits per group
+        if ':' in result:
+            import socket
+            try:
+                socket.inet_pton(socket.AF_INET6, result)
+            except socket.error:
+                raise ValueError('%r is not a valid IPv6 address' % value)
+        return result
 
 def existing_directory(v):
     nv = os.path.expanduser(v)
 
=== modified file 'ZConfig/tests/support.py'
--- ZConfig/tests/support.py	2011-03-24 18:29:45 +0000
+++ ZConfig/tests/support.py	2012-07-15 23:54:18 +0000
@@ -16,7 +16,6 @@
 
 import os
 import StringIO
-import unittest
 import urllib
 
 import ZConfig
@@ -35,9 +34,12 @@
 CONFIG_BASE = "file://%s/" % urllib.pathname2url(d)
 
 
-class TestBase(unittest.TestCase):
+class TestHelper:
     """Utility methods which can be used with the schema support."""
 
+    # Not derived from unittest.TestCase; some test runners seem to
+    # think that means this class contains tests.
+
     def load_both(self, schema_url, conf_url):
         schema = self.load_schema(schema_url)
         conf = self.load_config(schema, conf_url)
 
=== modified file 'ZConfig/tests/test_cfgimports.py'
--- ZConfig/tests/test_cfgimports.py	2011-03-24 18:29:45 +0000
+++ ZConfig/tests/test_cfgimports.py	2012-07-15 23:54:18 +0000
@@ -24,7 +24,8 @@
 import ZConfig.tests.support
 
 
-class TestImportFromConfiguration(ZConfig.tests.support.TestBase):
+class TestImportFromConfiguration(
+    ZConfig.tests.support.TestHelper, unittest.TestCase):
 
     def test_simple_import(self):
         schema = self.load_schema_text("<schema/>")
 
=== modified file 'ZConfig/tests/test_cmdline.py'
--- ZConfig/tests/test_cmdline.py	2011-03-24 18:29:45 +0000
+++ ZConfig/tests/test_cmdline.py	2012-07-15 23:54:18 +0000
@@ -17,12 +17,12 @@
 import unittest
 
 import ZConfig
+import ZConfig.tests.support
 
 from ZConfig.cmdline import ExtendedConfigLoader
-from ZConfig.tests.support import TestBase
-
-
-class CommandLineTest(TestBase):
+
+
+class CommandLineTest(ZConfig.tests.support.TestHelper, unittest.TestCase):
 
     def create_config_loader(self, schema):
         loader = ExtendedConfigLoader(schema)
 
=== modified file 'ZConfig/tests/test_config.py'
--- ZConfig/tests/test_config.py	2011-03-24 18:29:45 +0000
+++ ZConfig/tests/test_config.py	2012-07-15 23:54:18 +0000
@@ -133,7 +133,9 @@
         self.assertRaises(ZConfig.ConfigurationSyntaxError,
                           self.loadtext, "%define abc-def\n")
         self.assertRaises(ZConfig.ConfigurationSyntaxError,
-                          self.loadtext, "%define a value\n%define a value\n")
+                          self.loadtext, "%define a value\n%define a other\n")
+        # doesn't raise if value is equal
+        self.loadtext("%define a value\n%define a value\n")
 
     def test_fragment_ident_disallowed(self):
         self.assertRaises(ZConfig.ConfigurationError,
 
=== modified file 'ZConfig/tests/test_cookbook.py'
--- ZConfig/tests/test_cookbook.py	2011-03-24 18:29:45 +0000
+++ ZConfig/tests/test_cookbook.py	2012-07-15 23:54:18 +0000
@@ -20,10 +20,9 @@
 
 """
 
+import ZConfig.tests.support
 import unittest
 
-from ZConfig.tests.support import TestBase
-
 
 def basic_key_mapping_password_to_passwd(key):
     # Lower-case the key since that's what basic-key does:
@@ -37,7 +36,7 @@
     return section
 
 
-class CookbookTestCase(TestBase):
+class CookbookTestCase(ZConfig.tests.support.TestHelper, unittest.TestCase):
 
     def test_rewriting_key_names(self):
         schema = self.load_schema_text("""
 
=== modified file 'ZConfig/tests/test_datatypes.py'
--- ZConfig/tests/test_datatypes.py	2011-03-24 18:29:45 +0000
+++ ZConfig/tests/test_datatypes.py	2012-07-15 23:54:18 +0000
@@ -183,9 +183,12 @@
         eq = self.assertEqual
         defhost = ZConfig.datatypes.DEFAULT_HOST
         eq(convert("Host.Example.Com:80"), ("host.example.com", 80))
+        eq(convert("Host.Example.Com:0"), ("host.example.com", 0))
         eq(convert(":80"),                 (defhost, 80))
         eq(convert("80"),                  (defhost, 80))
+        eq(convert("[::1]:80"),            ("::1", 80))
         eq(convert("host.EXAMPLE.com"),    ("host.example.com", None))
+        eq(convert("2001::ABCD"),             ("2001::abcd", None))
         self.assertRaises(ValueError, convert, "40 # foo")
 
     def test_datatype_inet_binding_address(self):
@@ -245,7 +248,7 @@
         raises = self.assertRaises
 
         raises(ValueError, convert, '-1')
-        raises(ValueError, convert, '0')
+        eq(convert('0'), 0)
         eq(convert('1'), 1)
         eq(convert('80'), 80)
         eq(convert('1023'), 1023)
@@ -258,6 +261,7 @@
         convert = self.types.get("socket-address")
         eq = self.assertEqual
         AF_INET = socket.AF_INET
+        AF_INET6 = socket.AF_INET6
         defhost = ZConfig.datatypes.DEFAULT_HOST
 
         def check(value, family, address, self=self, convert=convert):
@@ -269,6 +273,8 @@
         check(":80",                 AF_INET, (defhost, 80))
         check("80",                  AF_INET, (defhost, 80))
         check("host.EXAMPLE.com",    AF_INET, ("host.example.com",None))
+        check("::1",                 AF_INET6,("::1", None))
+        check("[::]:80",             AF_INET6,("::", 80))
         a1 = convert("/tmp/var/@345.4")
         a2 = convert("/tmp/var/@345.4:80")
         self.assertEqual(a1.address, "/tmp/var/@345.4")
@@ -291,11 +297,16 @@
         eq(convert('HOSTNAME.COM'),      'hostname.com')
         eq(convert('WWW.HOSTNAME.COM'),  'www.hostname.com')
         eq(convert('127.0.0.1'),         '127.0.0.1')
+        eq(convert('::1'),               '::1')
+        eq(convert('2001:DB8:1234:4567:89AB:cdef:0:1'), '2001:db8:1234:4567:89ab:cdef:0:1')
+        eq(convert('2001:DB8:1234:4567::10.11.12.13'), '2001:db8:1234:4567::10.11.12.13')
         raises(ValueError, convert,  '1hostnamewithleadingnumeric')
         raises(ValueError, convert,  '255.255')
         raises(ValueError, convert,  '12345678')
         raises(ValueError, convert,  '999.999.999.999')
         raises(ValueError, convert,  'a!badhostname')
+        raises(ValueError, convert,  '2001:DB8:0123:4567:89AB:cdef:0:1:2')
+        raises(ValueError, convert,  '2001:DB8:0123:4567::10.11.12.13.14')
 
     def test_existing_directory(self):
         convert = self.types.get('existing-directory')
 
=== modified file 'ZConfig/tests/test_loader.py'
--- ZConfig/tests/test_loader.py	2011-03-24 18:29:45 +0000
+++ ZConfig/tests/test_loader.py	2012-07-15 23:54:18 +0000
@@ -25,7 +25,7 @@
 import ZConfig.loader
 import ZConfig.url
 
-from ZConfig.tests.support import CONFIG_BASE, TestBase
+from ZConfig.tests.support import CONFIG_BASE, TestHelper
 
 
 try:
@@ -37,7 +37,7 @@
 LIBRARY_DIR = os.path.join(os.path.dirname(myfile), "library")
 
 
-class LoaderTestCase(TestBase):
+class LoaderTestCase(TestHelper, unittest.TestCase):
 
     def test_schema_caching(self):
         loader = ZConfig.loader.SchemaLoader()
 
=== modified file 'ZConfig/tests/test_readme.py'
--- ZConfig/tests/test_readme.py	2011-03-24 18:29:45 +0000
+++ ZConfig/tests/test_readme.py	2012-07-15 23:54:18 +0000
@@ -11,16 +11,17 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-import logging,os,unittest
-from zope.testing.doctest import DocFileSuite, REPORT_NDIFF,ELLIPSIS
-
-options = REPORT_NDIFF|ELLIPSIS
+import doctest
+import logging
+
+
+options = doctest.REPORT_NDIFF | doctest.ELLIPSIS
 
 old = {}
 def setUp(test):
     global old
-    logger=logging.getLogger()
-    old['level']=logger.level
+    logger = logging.getLogger()
+    old['level'] = logger.level
     old['handlers'] = logger.handlers[:]
 
 def tearDown(test):
@@ -29,7 +30,8 @@
     logger.handlers = old['handlers']
 
 def test_suite():
-    return unittest.TestSuite((
-        DocFileSuite('../../README.txt', optionflags=options,
-                     setUp=setUp,tearDown=tearDown),
-        ))
+    return doctest.DocFileSuite(
+        '../../README.txt',
+        optionflags=options,
+        setUp=setUp, tearDown=tearDown,
+        )
 
=== modified file 'ZConfig/tests/test_schema.py'
--- ZConfig/tests/test_schema.py	2011-03-24 18:29:45 +0000
+++ ZConfig/tests/test_schema.py	2012-07-15 23:54:18 +0000
@@ -17,7 +17,7 @@
 
 import ZConfig
 
-from ZConfig.tests.support import TestBase, CONFIG_BASE
+from ZConfig.tests.support import TestHelper, CONFIG_BASE
 
 
 def uppercase(value):
@@ -40,7 +40,7 @@
     return L
 
 
-class SchemaTestCase(TestBase):
+class SchemaTestCase(TestHelper, unittest.TestCase):
     """Tests of the basic schema support itself."""
 
     def test_minimal_schema(self):
 
=== modified file 'ZConfig/tests/test_schemaless.py'
--- ZConfig/tests/test_schemaless.py	2011-03-24 18:29:45 +0000
+++ ZConfig/tests/test_schemaless.py	2012-07-15 23:54:18 +0000
@@ -17,10 +17,7 @@
 """
 __docformat__ = "reStructuredText"
 
-try:
-    from zope.testing import doctest
-except ImportError:
-    import doctest
+import doctest
 
 
 def test_suite():
 
=== modified file 'bootstrap.py'
--- bootstrap.py	2011-03-24 18:29:45 +0000
+++ bootstrap.py	2012-07-15 23:54:18 +0000
@@ -16,37 +16,245 @@
 Simply run this script in a directory containing a buildout.cfg.
 The script accepts buildout command-line options, so you can
 use the -c option to specify an alternate configuration file.
-
-$Id: bootstrap.py 72703 2007-02-20 11:49:26Z jim $
 """
 
-import os, shutil, sys, tempfile, urllib2
-
-tmpeggs = tempfile.mkdtemp()
-
-ez = {}
-exec urllib2.urlopen('http://peak.telecommunity.com/dist/ez_setup.py'
-                     ).read() in ez
-ez['use_setuptools'](to_dir=tmpeggs, download_delay=0)
-
-import pkg_resources
-
-cmd = 'from setuptools.command.easy_install import main; main()'
+import os, shutil, sys, tempfile, textwrap, urllib, urllib2, subprocess
+from optparse import OptionParser
+
 if sys.platform == 'win32':
-    cmd = '"%s"' % cmd # work around spawn lamosity on windows
-
+    def quote(c):
+        if ' ' in c:
+            return '"%s"' % c # work around spawn lamosity on windows
+        else:
+            return c
+else:
+    quote = str
+
+# See zc.buildout.easy_install._has_broken_dash_S for motivation and comments.
+stdout, stderr = subprocess.Popen(
+    [sys.executable, '-Sc',
+     'try:\n'
+     '    import ConfigParser\n'
+     'except ImportError:\n'
+     '    print 1\n'
+     'else:\n'
+     '    print 0\n'],
+    stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
+has_broken_dash_S = bool(int(stdout.strip()))
+
+# In order to be more robust in the face of system Pythons, we want to
+# run without site-packages loaded.  This is somewhat tricky, in
+# particular because Python 2.6's distutils imports site, so starting
+# with the -S flag is not sufficient.  However, we'll start with that:
+if not has_broken_dash_S and 'site' in sys.modules:
+    # We will restart with python -S.
+    args = sys.argv[:]
+    args[0:0] = [sys.executable, '-S']
+    args = map(quote, args)
+    os.execv(sys.executable, args)
+# Now we are running with -S.  We'll get the clean sys.path, import site
+# because distutils will do it later, and then reset the path and clean
+# out any namespace packages from site-packages that might have been
+# loaded by .pth files.
+clean_path = sys.path[:]
+import site
+sys.path[:] = clean_path
+for k, v in sys.modules.items():
+    if k in ('setuptools', 'pkg_resources') or (
+        hasattr(v, '__path__') and
+        len(v.__path__)==1 and
+        not os.path.exists(os.path.join(v.__path__[0],'__init__.py'))):
+        # This is a namespace package.  Remove it.
+        sys.modules.pop(k)
+
+is_jython = sys.platform.startswith('java')
+
+setuptools_source = 'http://peak.telecommunity.com/dist/ez_setup.py'
+distribute_source = 'http://python-distribute.org/distribute_setup.py'
+
+# parsing arguments
+def normalize_to_url(option, opt_str, value, parser):
+    if value:
+        if '://' not in value: # It doesn't smell like a URL.
+            value = 'file://%s' % (
+                urllib.pathname2url(
+                    os.path.abspath(os.path.expanduser(value))),)
+        if opt_str == '--download-base' and not value.endswith('/'):
+            # Download base needs a trailing slash to make the world happy.
+            value += '/'
+    else:
+        value = None
+    name = opt_str[2:].replace('-', '_')
+    setattr(parser.values, name, value)
+
+usage = '''\
+[DESIRED PYTHON FOR BUILDOUT] bootstrap.py [options]
+
+Bootstraps a buildout-based project.
+
+Simply run this script in a directory containing a buildout.cfg, using the
+Python that you want bin/buildout to use.
+
+Note that by using --setup-source and --download-base to point to
+local resources, you can keep this script from going over the network.
+'''
+
+parser = OptionParser(usage=usage)
+parser.add_option("-v", "--version", dest="version",
+                          help="use a specific zc.buildout version")
+parser.add_option("-d", "--distribute",
+                   action="store_true", dest="use_distribute", default=False,
+                   help="Use Distribute rather than Setuptools.")
+parser.add_option("--setup-source", action="callback", dest="setup_source",
+                  callback=normalize_to_url, nargs=1, type="string",
+                  help=("Specify a URL or file location for the setup file. "
+                        "If you use Setuptools, this will default to " +
+                        setuptools_source + "; if you use Distribute, this "
+                        "will default to " + distribute_source +"."))
+parser.add_option("--download-base", action="callback", dest="download_base",
+                  callback=normalize_to_url, nargs=1, type="string",
+                  help=("Specify a URL or directory for downloading "
+                        "zc.buildout and either Setuptools or Distribute. "
+                        "Defaults to PyPI."))
+parser.add_option("--eggs",
+                  help=("Specify a directory for storing eggs.  Defaults to "
+                        "a temporary directory that is deleted when the "
+                        "bootstrap script completes."))
+parser.add_option("-t", "--accept-buildout-test-releases",
+                  dest='accept_buildout_test_releases',
+                  action="store_true", default=False,
+                  help=("Normally, if you do not specify a --version, the "
+                        "bootstrap script and buildout gets the newest "
+                        "*final* versions of zc.buildout and its recipes and "
+                        "extensions for you.  If you use this flag, "
+                        "bootstrap and buildout will get the newest releases "
+                        "even if they are alphas or betas."))
+parser.add_option("-c", None, action="store", dest="config_file",
+                   help=("Specify the path to the buildout configuration "
+                         "file to be used."))
+
+options, args = parser.parse_args()
+
+# if -c was provided, we push it back into args for buildout's main function
+if options.config_file is not None:
+    args += ['-c', options.config_file]
+
+if options.eggs:
+    eggs_dir = os.path.abspath(os.path.expanduser(options.eggs))
+else:
+    eggs_dir = tempfile.mkdtemp()
+
+if options.setup_source is None:
+    if options.use_distribute:
+        options.setup_source = distribute_source
+    else:
+        options.setup_source = setuptools_source
+
+if options.accept_buildout_test_releases:
+    args.append('buildout:accept-buildout-test-releases=true')
+args.append('bootstrap')
+
+try:
+    import pkg_resources
+    import setuptools # A flag.  Sometimes pkg_resources is installed alone.
+    if not hasattr(pkg_resources, '_distribute'):
+        raise ImportError
+except ImportError:
+    ez_code = urllib2.urlopen(
+        options.setup_source).read().replace('\r\n', '\n')
+    ez = {}
+    exec ez_code in ez
+    setup_args = dict(to_dir=eggs_dir, download_delay=0)
+    if options.download_base:
+        setup_args['download_base'] = options.download_base
+    if options.use_distribute:
+        setup_args['no_fake'] = True
+    ez['use_setuptools'](**setup_args)
+    if 'pkg_resources' in sys.modules:
+        reload(sys.modules['pkg_resources'])
+    import pkg_resources
+    # This does not (always?) update the default working set.  We will
+    # do it.
+    for path in sys.path:
+        if path not in pkg_resources.working_set.entries:
+            pkg_resources.working_set.add_entry(path)
+
+cmd = [quote(sys.executable),
+       '-c',
+       quote('from setuptools.command.easy_install import main; main()'),
+       '-mqNxd',
+       quote(eggs_dir)]
+
+if not has_broken_dash_S:
+    cmd.insert(1, '-S')
+
+find_links = options.download_base
+if not find_links:
+    find_links = os.environ.get('bootstrap-testing-find-links')
+if find_links:
+    cmd.extend(['-f', quote(find_links)])
+
+if options.use_distribute:
+    setup_requirement = 'distribute'
+else:
+    setup_requirement = 'setuptools'
 ws = pkg_resources.working_set
-assert os.spawnle(
-    os.P_WAIT, sys.executable, sys.executable,
-    '-c', cmd, '-mqNxd', tmpeggs, 'zc.buildout',
-    dict(os.environ,
-         PYTHONPATH=
-         ws.find(pkg_resources.Requirement.parse('setuptools')).location
-         ),
-    ) == 0
-
-ws.add_entry(tmpeggs)
-ws.require('zc.buildout')
+setup_requirement_path = ws.find(
+    pkg_resources.Requirement.parse(setup_requirement)).location
+env = dict(
+    os.environ,
+    PYTHONPATH=setup_requirement_path)
+
+requirement = 'zc.buildout'
+version = options.version
+if version is None and not options.accept_buildout_test_releases:
+    # Figure out the most recent final version of zc.buildout.
+    import setuptools.package_index
+    _final_parts = '*final-', '*final'
+    def _final_version(parsed_version):
+        for part in parsed_version:
+            if (part[:1] == '*') and (part not in _final_parts):
+                return False
+        return True
+    index = setuptools.package_index.PackageIndex(
+        search_path=[setup_requirement_path])
+    if find_links:
+        index.add_find_links((find_links,))
+    req = pkg_resources.Requirement.parse(requirement)
+    if index.obtain(req) is not None:
+        best = []
+        bestv = None
+        for dist in index[req.project_name]:
+            distv = dist.parsed_version
+            if _final_version(distv):
+                if bestv is None or distv > bestv:
+                    best = [dist]
+                    bestv = distv
+                elif distv == bestv:
+                    best.append(dist)
+        if best:
+            best.sort()
+            version = best[-1].version
+if version:
+    requirement = '=='.join((requirement, version))
+cmd.append(requirement)
+
+if is_jython:
+    import subprocess
+    exitcode = subprocess.Popen(cmd, env=env).wait()
+else: # Windows prefers this, apparently; otherwise we would prefer subprocess
+    exitcode = os.spawnle(*([os.P_WAIT, sys.executable] + cmd + [env]))
+if exitcode != 0:
+    sys.stdout.flush()
+    sys.stderr.flush()
+    print ("An error occurred when trying to install zc.buildout. "
+           "Look above this message for any errors that "
+           "were output by easy_install.")
+    sys.exit(exitcode)
+
+ws.add_entry(eggs_dir)
+ws.require(requirement)
 import zc.buildout.buildout
-zc.buildout.buildout.main(sys.argv[1:] + ['bootstrap'])
-shutil.rmtree(tmpeggs)
+zc.buildout.buildout.main(args)
+if not options.eggs: # clean up temporary egg directory
+    shutil.rmtree(eggs_dir)
 
=== modified file 'buildout.cfg'
--- buildout.cfg	2009-06-18 17:30:22 +0000
+++ buildout.cfg	2012-07-15 23:54:18 +0000
@@ -1,9 +1,14 @@
 [buildout]
 develop = .
-find-links = http://download.zope.org/distribution/
-parts = test
+parts = nosetests test
+prefer-final = true
+
+[nosetests]
+recipe = zc.recipe.egg
+eggs = nose
+scripts = nosetests
 
 [test]
 recipe = zc.recipe.testrunner
 eggs = ZConfig
-defaults = '--exit-with-status -1'.split()
+defaults = ['-1']
 
=== modified file 'debian/changelog'
--- debian/changelog	2011-12-31 08:17:16 +0000
+++ debian/changelog	2012-07-15 23:54:18 +0000
@@ -1,3 +1,10 @@
+zconfig (2.9.3-0ubuntu1) quantal; urgency=low
+
+  * New upstream release.
+  * Bump Standards-Version to 3.9.3.
+
+ -- Logan Rosen <[e-mail]>  Sun, 15 Jul 2012 19:48:02 -0400
+
 zconfig (2.8.0-1build1) precise; urgency=low
 
   * Rebuild to drop python2.6 dependencies.
 
=== modified file 'debian/control'
--- debian/control	2011-05-06 22:36:13 +0000
+++ debian/control	2012-07-15 23:54:18 +0000
@@ -8,7 +8,7 @@
                python-all (>= 2.6.6-3~),
                python-setuptools,
                python-van.pydeb (>= 1.3.0-4)
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 X-Python-Version: >= 2.4
 Homepage: http://www.zope.org/Members/fdrake/zconfig
 Vcs-Svn: svn://svn.debian.org/pkg-zope/zconfig/trunk
 
=== modified file 'doc/zconfig.tex'
--- doc/zconfig.tex	2011-03-24 18:29:45 +0000
+++ doc/zconfig.tex	2012-07-15 23:54:18 +0000
@@ -272,9 +272,8 @@
 pairs.
 
 Names must be defined before they are used, and may not be
-re-defined.  All resources being parsed as part of a configuration
-share a single namespace for defined names.  This means that resources
-which may be included more than once should not define any names.
+re-defined with a different value.  All resources being parsed as part of
+a configuration share a single namespace for defined names.
 
 References to defined names from configuration values use the syntax
 described for the \refmodule{ZConfig.substitution} module.
@@ -906,7 +905,9 @@
   will be returned for \var{hostname}.  The default host is
   \code{localhost} on Windows and the empty string on all other
   platforms.  If the port is omitted, \code{None} will be returned for
-  \var{port}.
+  \var{port}. IPv6 addresses can be specified in colon-separated notation;
+  if both host and port need to be specified, the bracketed form
+  (\code{[addr]:port}) must be used.
 
 \term{\datatype{inet-binding-address}}
   An Internet address expressed as a \code{(\var{hostname},
@@ -932,7 +933,8 @@
   Validates a valid IP address or hostname.  If the first 
   character is a digit, the value is assumed to be an IP 
   address.  If the first character is not a digit, the value 
-  is assumed to be a hostname.  Hostnames are converted to lower
+  is assumed to be a hostname.  Strings containing colons are
+  considered IPv6 address.  Hostnames are converted to lower
   case.
 
 \term{\datatype{locale}}
 
=== modified file 'setup.py'
--- setup.py	2011-03-24 18:29:45 +0000
+++ setup.py	2012-07-15 23:54:18 +0000
@@ -4,23 +4,21 @@
 def alltests():
     import os
     import sys
-    from unittest import TestSuite
-    # use the zope.testing testrunner machinery to find all the
+    import unittest
+    # use the zope.testrunner machinery to find all the
     # test suites we've put under ourselves
-    from zope.testing.testrunner import get_options
-    from zope.testing.testrunner import find_suites
-    from zope.testing.testrunner import configure_logging
-    configure_logging()
+    import zope.testrunner.find
+    import zope.testrunner.options
     here = os.path.abspath(os.path.dirname(sys.argv[0]))
     args = sys.argv[:]
     defaults = ["--test-path", here]
-    options = get_options(args, defaults)
-    suites = list(find_suites(options))
-    return TestSuite(suites)
+    options = zope.testrunner.options.get_options(args, defaults)
+    suites = list(zope.testrunner.find.find_suites(options))
+    return unittest.TestSuite(suites)
 
 options = dict(
     name="ZConfig",
-    version="2.8.0",
+    version="2.9.3",
     author="Fred L. Drake, Jr.",
     author_email="[e-mail]",
     maintainer="Zope Foundation and Contributors",
@@ -53,12 +51,12 @@
         "Programming Language :: Python :: 2.4",
         "Programming Language :: Python :: 2.5",
         "Programming Language :: Python :: 2.6",
-        "Topic :: Software Development :: Libraries :: Python Modules",
+        "Programming Language :: Python :: 2.7",
         ],
     # Support for 'setup.py test' when setuptools is available:
     test_suite="__main__.alltests",
     tests_require=[
-        "zope.testing",
+        "zope.testrunner",
         ],
     )