Merge lp:~ricardokirkner/configglue/from-future-remove-configparser into lp:configglue

[Ricardo Kirkner]

use compat module to define base for SchemaConfigParser that abstracts differences from Python 2.x and 3.x configparser modules

- compat module is PSF licensed.
- also removed debian folder to leave packaging up to distros

[dobey (dobey)]

34 + # taken from Python 3.3's configparser module

The code this is referencing should probably be put in a separate file, and have its licensing/copyright legally clarified, as configglue is BSD, and not the Python license. I'm not sure if this is conflict legally either, as including Python licensed code inside a BSD licensed project may be problematic. Anyway, it needs clarification. The debian/copyright will also need updated.

review: Needs Fixing

[Barry Warsaw (barry)]

You need to remove the configparser dependencies in the tox.ini file.

[Barry Warsaw (barry)]

=== modified file 'configglue/_compat.py'
--- configglue/_compat.py 2013-05-27 00:56:38 +0000
+++ configglue/_compat.py 2013-07-09 20:10:35 +0000
> @@ -4,12 +4,109 @@
> PY2 = sys.version_info[0] == 2
>
> if not PY2:

I generally like to do positive conditionals, since negative conditionals are
more difficult to reason about. E.g. as currently written it takes longer to
realize that the if-stanza is for Python 3 and the else stanza is for Python
2.

=== modified file 'configglue/glue.py'
--- configglue/glue.py 2013-05-25 15:21:04 +0000
+++ configglue/glue.py 2013-07-09 20:10:35 +0000
> @@ -16,13 +16,10 @@
>
> import os
> import sys
> -from configparser import (
> - NoOptionError,
> - NoSectionError,
> -)

You could probably change this to:

from ._compat.configparser import (
    NoOptionError,
    NoSectionError,
    )

and then none of the except clauses would need to change.

> from optparse import OptionParser
> from collections import namedtuple
>
> +from ._compat import configparser
> from .parser import SchemaConfigParser
>
>
> @@ -68,7 +65,7 @@
> kwargs['help'] = option.help
> try:
> kwargs['default'] = parser.get(section.name, option.name)
> - except (NoSectionError, NoOptionError):
> + except (configparser.NoSectionError, configparser.NoOptionError):
> pass
> kwargs['action'] = option.action
> args = ['--' + long_name(option)]
> @@ -92,7 +89,7 @@
> op_value = getattr(options, opt_name(option))
> try:
> parser_value = parser.get(section.name, option.name)
> - except (NoSectionError, NoOptionError):
> + except (configparser.NoSectionError, configparser.NoOptionError):
> parser_value = None
> env_value = os.environ.get("CONFIGGLUE_{0}".format(
> long_name(option).upper()))

=== modified file 'configglue/parser.py'
--- configglue/parser.py 2013-07-08 20:10:06 +0000
+++ configglue/parser.py 2013-07-09 20:10:35 +0000
> @@ -21,16 +21,9 @@
> import os
> import re
>
> -from configparser import (
> - DEFAULTSECT,
> - SafeConfigParser as BaseConfigParser,
> - InterpolationMissingOptionError,
> - NoOptionError,
> - NoSectionError,
> -)

Similarly, this could probably be

from ._compat.configparser import (
    ...
    )

and less of the following code would need to change.

=== modified file 'configglue/schema.py'
--- configglue/schema.py 2013-05-26 19:07:46 +0000
+++ configglue/schema.py 2013-07-09 20:10:35 +0000
> @@ -16,14 +16,11 @@
> from __future__ import unicode_literals
>
> import json
> -from configparser import (
> - NoSectionError,
> - NoOptionError,
> -)

Similarly, here.

> from copy import deepcopy
> from inspect import getmembers
>
> -from configglue._compat import text_type, string_types
> +from ._compat import configparser, text_type, string_types
> +
>
>
> __all__ = [
> @@ -177,7 +174,7 @@
> """Return a Section by name"""
> section = self._sections.get(name)
> if section is None:
> - raise NoSectionError(name...

[Barry Warsaw (barry)]

review: Needs Fixing

[lp:~ricardokirkner/configglue/from-future-remove-configparser]

109. By Ricardo Kirkner on 2013-07-11

remove configparser from dependencies

110. By Ricardo Kirkner on 2013-07-11

moved BasicInterpolation class to it's own module due to different licensing

111. By Ricardo Kirkner on 2013-07-11

updated copyright info

112. By Ricardo Kirkner on 2013-07-11

added encoding modeline

113. By Ricardo Kirkner on 2013-07-11

unified _compat and _compat_parser again

removed need to namespace configparser/ConfigParser imports

114. By Ricardo Kirkner on 2013-07-11

removed debian folder

leave that to real packagers

115. By Ricardo Kirkner on 2013-07-11

updated copyright dates

116. By Ricardo Kirkner on 2013-07-11

updated license for _compat.py module

[Barry Warsaw (barry)]

Thanks for the fixes. I can work with this.

review: Approve

[dobey (dobey)]

review: Approve

=== modified file 'LICENSE'
--- LICENSE	2010-07-31 00:58:37 +0000
+++ LICENSE	2013-07-11 19:08:28 +0000
@@ -1,4 +1,4 @@
-Copyright 2009, 2010 Canonical Ltd. All rights reserved.
+Copyright 2009--2013 Canonical Ltd. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
 
=== added file 'LICENSE.PSF'
--- LICENSE.PSF	1970-01-01 00:00:00 +0000
+++ LICENSE.PSF	2013-07-11 19:08:28 +0000
@@ -0,0 +1,22 @@
+PSF LICENSE AGREEMENT FOR PYTHON 2.7.5
+
+This LICENSE AGREEMENT is between the Python Software Foundation (“PSF”), and the Individual or Organization (“Licensee”) accessing and otherwise using Python 2.7.5 software in source or binary form and its associated documentation.
+Subject to the terms and conditions of this License Agreement, PSF hereby grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce, analyze, test, perform and/or display publicly, prepare derivative works, distribute, and otherwise use Python 2.7.5 alone or in any derivative version, provided, however, that PSF’s License Agreement and PSF’s notice of copyright, i.e., “Copyright © 2001-2013 Python Software Foundation; All Rights Reserved” are retained in Python 2.7.5 alone or in any derivative version prepared by Licensee.
+In the event Licensee prepares a derivative work that is based on or incorporates Python 2.7.5 or any part thereof, and wants to make the derivative work available to others as provided herein, then Licensee hereby agrees to include in any such work a brief summary of the changes made to Python 2.7.5.
+PSF is making Python 2.7.5 available to Licensee on an “AS IS” basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 2.7.5 WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.
+PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON 2.7.5 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 2.7.5, OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
+This License Agreement will automatically terminate upon a material breach of its terms and conditions.
+Nothing in this License Agreement shall be deemed to create any relationship of agency, partnership, or joint venture between PSF and Licensee. This License Agreement does not grant permission to use PSF trademarks or trade name in a trademark sense to endorse or promote products or services of Licensee, or any third party.
+By copying, installing or otherwise using Python 2.7.5, Licensee agrees to be bound by the terms and conditions of this License Agreement.
+
+
+PSF LICENSE AGREEMENT FOR PYTHON 3.3.2
+
+This LICENSE AGREEMENT is between the Python Software Foundation (“PSF”), and the Individual or Organization (“Licensee”) accessing and otherwise using Python 3.3.2 software in source or binary form and its associated documentation.
+Subject to the terms and conditions of this License Agreement, PSF hereby grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce, analyze, test, perform and/or display publicly, prepare derivative works, distribute, and otherwise use Python 3.3.2 alone or in any derivative version, provided, however, that PSF’s License Agreement and PSF’s notice of copyright, i.e., “Copyright © 2001-2013 Python Software Foundation; All Rights Reserved” are retained in Python 3.3.2 alone or in any derivative version prepared by Licensee.
+In the event Licensee prepares a derivative work that is based on or incorporates Python 3.3.2 or any part thereof, and wants to make the derivative work available to others as provided herein, then Licensee hereby agrees to include in any such work a brief summary of the changes made to Python 3.3.2.
+PSF is making Python 3.3.2 available to Licensee on an “AS IS” basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 3.3.2 WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.
+PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON 3.3.2 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 3.3.2, OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
+This License Agreement will automatically terminate upon a material breach of its terms and conditions.
+Nothing in this License Agreement shall be deemed to create any relationship of agency, partnership, or joint venture between PSF and Licensee. This License Agreement does not grant permission to use PSF trademarks or trade name in a trademark sense to endorse or promote products or services of Licensee, or any third party.
+By copying, installing or otherwise using Python 3.3.2, Licensee agrees to be bound by the terms and conditions of this License Agreement.
 
=== modified file 'configglue/__init__.py'
--- configglue/__init__.py	2013-07-08 20:57:17 +0000
+++ configglue/__init__.py	2013-07-11 19:08:28 +0000
@@ -4,7 +4,7 @@
 #
 # A library for simple, DRY configuration of applications
 #
-# (C) 2009--2011 by Canonical Ltd.
+# (C) 2009--2013 by Canonical Ltd.
 # by John R. Lenton <[e-mail]>
 # and Ricardo Kirkner <[e-mail]>
 #
 
=== modified file 'configglue/_compat.py'
--- configglue/_compat.py	2013-05-27 00:56:38 +0000
+++ configglue/_compat.py	2013-07-11 19:08:28 +0000
@@ -1,15 +1,137 @@
+# -*- coding: utf-8 -*-
+###############################################################################
+#
+# configglue -- glue for your apps' configuration
+#
+# A library for simple, DRY configuration of applications
+#
+# (C) 2013 by Canonical Ltd.
+# by John R. Lenton <[e-mail]>
+# and Ricardo Kirkner <[e-mail]>
+# (C) Python Software Foundation (“PSF”)
+#
+# Released under the PSF License Agreement (see the file LICENSE.PSF)
+#
+# For bug reports, support, and new releases: http://launchpad.net/configglue
+#
+###############################################################################
+import re
 import sys
 
 
 PY2 = sys.version_info[0] == 2
 
-if not PY2:
+if PY2:
+    import __builtin__ as builtins
+    import ConfigParser as configparser
+    from ConfigParser import (
+        DEFAULTSECT,
+        InterpolationDepthError,
+        InterpolationMissingOptionError,
+        InterpolationSyntaxError,
+        NoOptionError,
+        NoSectionError,
+        RawConfigParser,
+    )
+
+    class BasicInterpolation(object):
+        """Interpolation as implemented in the classic ConfigParser.
+
+        The option values can contain format strings which refer to other
+        values in the same section, or values in the special default section.
+
+        For example:
+
+            something: %(dir)s/whatever
+
+        would resolve the "%(dir)s" to the value of dir.  All reference
+        expansions are done late, on demand. If a user needs to use a
+        bare % in a configuration file, she can escape it by writing %%.
+        Other % usage is considered a user error and
+        raises `InterpolationSyntaxError'."""
+
+        _KEYCRE = re.compile(r"%\(([^)]+)\)s")
+
+        def before_get(self, parser, section, option, value, defaults):
+            L = []
+            self._interpolate_some(parser, option, L, value, section,
+                                defaults, 1)
+            return ''.join(L)
+
+        def before_set(self, parser, section, option, value):
+            tmp_value = value.replace('%%', '') # escaped percent signs
+            tmp_value = self._KEYCRE.sub('', tmp_value) # valid syntax
+            if '%' in tmp_value:
+                raise ValueError("invalid interpolation syntax in %r at "
+                                "position %d" % (value, tmp_value.find('%')))
+            return value
+
+        def _interpolate_some(self, parser, option, accum, rest, section, map,
+                            depth):
+            if depth > configparser.MAX_INTERPOLATION_DEPTH:
+                raise configparser.InterpolationDepthError(option, section,
+                                                        rest)
+            while rest:
+                p = rest.find("%")
+                if p < 0:
+                    accum.append(rest)
+                    return
+                if p > 0:
+                    accum.append(rest[:p])
+                    rest = rest[p:]
+                # p is no longer used
+                c = rest[1:2]
+                if c == "%":
+                    accum.append("%")
+                    rest = rest[2:]
+                elif c == "(":
+                    m = self._KEYCRE.match(rest)
+                    if m is None:
+                        raise configparser.InterpolationSyntaxError(option,
+                                                                    section,
+                            "bad interpolation variable reference %r" % rest)
+                    var = parser.optionxform(m.group(1))
+                    rest = rest[m.end():]
+                    try:
+                        v = map[var]
+                    except KeyError:
+                        raise configparser.InterpolationMissingOptionError(
+                            option, section, rest, var)
+                    if "%" in v:
+                        self._interpolate_some(parser, option, accum, v,
+                                            section, map, depth + 1)
+                    else:
+                        accum.append(v)
+                else:
+                    raise configparser.InterpolationSyntaxError(
+                        option, section,
+                        "'%%' must be followed by '%%' or '(', "
+                        "found: %r" % (rest,))
+
+    class BaseConfigParser(configparser.SafeConfigParser):
+        def __init__(self, *args, **kwargs):
+            configparser.SafeConfigParser.__init__(self, *args, **kwargs)
+
+            self._interpolation = BasicInterpolation()
+
+    text_type = unicode
+    string_types = (str, unicode)
+    iteritems = lambda d: d.iteritems()
+
+else:
+    import builtins
+    import configparser
+    from configparser import (
+        DEFAULTSECT,
+        InterpolationDepthError,
+        InterpolationMissingOptionError,
+        InterpolationSyntaxError,
+        NoOptionError,
+        NoSectionError,
+        RawConfigParser,
+    )
+
+    BaseConfigParser = configparser.SafeConfigParser
     text_type = str
     string_types = (str,)
-    import builtins
     iteritems = lambda d: iter(d.items())
-else:
-    text_type = unicode
-    string_types = (str, unicode)
-    import __builtin__ as builtins
-    iteritems = lambda d: d.iteritems()
 
=== modified file 'configglue/app/__init__.py'
--- configglue/app/__init__.py	2011-07-17 22:32:16 +0000
+++ configglue/app/__init__.py	2013-07-11 19:08:28 +0000
@@ -4,7 +4,7 @@
 #
 # A library for simple, DRY configuration of applications
 #
-# (C) 2009--2011 by Canonical Ltd.
+# (C) 2009--2013 by Canonical Ltd.
 # by John R. Lenton <[e-mail]>
 # and Ricardo Kirkner <[e-mail]>
 #
 
=== modified file 'configglue/app/base.py'
--- configglue/app/base.py	2011-07-23 20:26:54 +0000
+++ configglue/app/base.py	2013-07-11 19:08:28 +0000
@@ -4,7 +4,7 @@
 #
 # A library for simple, DRY configuration of applications
 #
-# (C) 2009--2011 by Canonical Ltd.
+# (C) 2009--2013 by Canonical Ltd.
 # by John R. Lenton <[e-mail]>
 # and Ricardo Kirkner <[e-mail]>
 #
 
=== modified file 'configglue/app/plugin.py'
--- configglue/app/plugin.py	2011-07-17 22:32:16 +0000
+++ configglue/app/plugin.py	2013-07-11 19:08:28 +0000
@@ -4,7 +4,7 @@
 #
 # A library for simple, DRY configuration of applications
 #
-# (C) 2009--2011 by Canonical Ltd.
+# (C) 2009--2013 by Canonical Ltd.
 # by John R. Lenton <[e-mail]>
 # and Ricardo Kirkner <[e-mail]>
 #
 
=== modified file 'configglue/contrib/__init__.py'
--- configglue/contrib/__init__.py	2012-04-24 15:58:44 +0000
+++ configglue/contrib/__init__.py	2013-07-11 19:08:28 +0000
@@ -4,7 +4,7 @@
 #
 # A library for simple, DRY configuration of applications
 #
-# (C) 2009--2012 by Canonical Ltd.
+# (C) 2009--2013 by Canonical Ltd.
 # by John R. Lenton <[e-mail]>
 # and Ricardo Kirkner <[e-mail]>
 #
 
=== modified file 'configglue/contrib/schema/__init__.py'
--- configglue/contrib/schema/__init__.py	2012-05-04 19:22:39 +0000
+++ configglue/contrib/schema/__init__.py	2013-07-11 19:08:28 +0000
@@ -4,7 +4,7 @@
 #
 # A library for simple, DRY configuration of applications
 #
-# (C) 2009--2012 by Canonical Ltd.
+# (C) 2009--2013 by Canonical Ltd.
 # by John R. Lenton <[e-mail]>
 # and Ricardo Kirkner <[e-mail]>
 #
 
=== modified file 'configglue/contrib/schema/devserver.py'
--- configglue/contrib/schema/devserver.py	2012-04-24 15:58:44 +0000
+++ configglue/contrib/schema/devserver.py	2013-07-11 19:08:28 +0000
@@ -1,3 +1,18 @@
+###############################################################################
+#
+# configglue -- glue for your apps' configuration
+#
+# A library for simple, DRY configuration of applications
+#
+# (C) 2009--2013 by Canonical Ltd.
+# by John R. Lenton <[e-mail]>
+# and Ricardo Kirkner <[e-mail]>
+#
+# Released under the BSD License (see the file LICENSE)
+#
+# For bug reports, support, and new releases: http://launchpad.net/configglue
+#
+###############################################################################
 from configglue.schema import (
     BoolOption,
     IntOption,
 
=== modified file 'configglue/contrib/schema/django_jenkins.py'
--- configglue/contrib/schema/django_jenkins.py	2012-04-24 15:58:44 +0000
+++ configglue/contrib/schema/django_jenkins.py	2013-07-11 19:08:28 +0000
@@ -1,3 +1,18 @@
+###############################################################################
+#
+# configglue -- glue for your apps' configuration
+#
+# A library for simple, DRY configuration of applications
+#
+# (C) 2009--2013 by Canonical Ltd.
+# by John R. Lenton <[e-mail]>
+# and Ricardo Kirkner <[e-mail]>
+#
+# Released under the BSD License (see the file LICENSE)
+#
+# For bug reports, support, and new releases: http://launchpad.net/configglue
+#
+###############################################################################
 from configglue.schema import (
     ListOption,
     Schema,
 
=== modified file 'configglue/contrib/schema/django_openid_auth.py'
--- configglue/contrib/schema/django_openid_auth.py	2013-05-30 19:41:51 +0000
+++ configglue/contrib/schema/django_openid_auth.py	2013-07-11 19:08:28 +0000
@@ -1,3 +1,18 @@
+###############################################################################
+#
+# configglue -- glue for your apps' configuration
+#
+# A library for simple, DRY configuration of applications
+#
+# (C) 2009--2013 by Canonical Ltd.
+# by John R. Lenton <[e-mail]>
+# and Ricardo Kirkner <[e-mail]>
+#
+# Released under the BSD License (see the file LICENSE)
+#
+# For bug reports, support, and new releases: http://launchpad.net/configglue
+#
+###############################################################################
 from configglue.schema import (
     BoolOption,
     DictOption,
 
=== modified file 'configglue/contrib/schema/nexus.py'
--- configglue/contrib/schema/nexus.py	2012-04-24 15:58:44 +0000
+++ configglue/contrib/schema/nexus.py	2013-07-11 19:08:28 +0000
@@ -1,3 +1,18 @@
+###############################################################################
+#
+# configglue -- glue for your apps' configuration
+#
+# A library for simple, DRY configuration of applications
+#
+# (C) 2009--2013 by Canonical Ltd.
+# by John R. Lenton <[e-mail]>
+# and Ricardo Kirkner <[e-mail]>
+#
+# Released under the BSD License (see the file LICENSE)
+#
+# For bug reports, support, and new releases: http://launchpad.net/configglue
+#
+###############################################################################
 from configglue.schema import BoolOption, Schema, Section, StringOption
 
 
 
=== modified file 'configglue/contrib/schema/preflight.py'
--- configglue/contrib/schema/preflight.py	2012-04-24 15:58:44 +0000
+++ configglue/contrib/schema/preflight.py	2013-07-11 19:08:28 +0000
@@ -1,3 +1,18 @@
+###############################################################################
+#
+# configglue -- glue for your apps' configuration
+#
+# A library for simple, DRY configuration of applications
+#
+# (C) 2009--2013 by Canonical Ltd.
+# by John R. Lenton <[e-mail]>
+# and Ricardo Kirkner <[e-mail]>
+#
+# Released under the BSD License (see the file LICENSE)
+#
+# For bug reports, support, and new releases: http://launchpad.net/configglue
+#
+###############################################################################
 from configglue.schema import Section, Schema, StringOption
 
 
 
=== modified file 'configglue/contrib/schema/pystatsd.py'
--- configglue/contrib/schema/pystatsd.py	2012-05-10 12:45:19 +0000
+++ configglue/contrib/schema/pystatsd.py	2013-07-11 19:08:28 +0000
@@ -1,3 +1,18 @@
+###############################################################################
+#
+# configglue -- glue for your apps' configuration
+#
+# A library for simple, DRY configuration of applications
+#
+# (C) 2009--2013 by Canonical Ltd.
+# by John R. Lenton <[e-mail]>
+# and Ricardo Kirkner <[e-mail]>
+#
+# Released under the BSD License (see the file LICENSE)
+#
+# For bug reports, support, and new releases: http://launchpad.net/configglue
+#
+###############################################################################
 from configglue.schema import IntOption, Schema, Section, StringOption
 
 
 
=== modified file 'configglue/contrib/schema/raven.py'
--- configglue/contrib/schema/raven.py	2012-04-24 18:17:41 +0000
+++ configglue/contrib/schema/raven.py	2013-07-11 19:08:28 +0000
@@ -1,3 +1,18 @@
+###############################################################################
+#
+# configglue -- glue for your apps' configuration
+#
+# A library for simple, DRY configuration of applications
+#
+# (C) 2009--2013 by Canonical Ltd.
+# by John R. Lenton <[e-mail]>
+# and Ricardo Kirkner <[e-mail]>
+#
+# Released under the BSD License (see the file LICENSE)
+#
+# For bug reports, support, and new releases: http://launchpad.net/configglue
+#
+###############################################################################
 from configglue.schema import (
     BoolOption,
     IntOption,
 
=== modified file 'configglue/contrib/schema/saml2idp.py'
--- configglue/contrib/schema/saml2idp.py	2012-04-24 15:58:44 +0000
+++ configglue/contrib/schema/saml2idp.py	2013-07-11 19:08:28 +0000
@@ -1,3 +1,18 @@
+###############################################################################
+#
+# configglue -- glue for your apps' configuration
+#
+# A library for simple, DRY configuration of applications
+#
+# (C) 2009--2013 by Canonical Ltd.
+# by John R. Lenton <[e-mail]>
+# and Ricardo Kirkner <[e-mail]>
+#
+# Released under the BSD License (see the file LICENSE)
+#
+# For bug reports, support, and new releases: http://launchpad.net/configglue
+#
+###############################################################################
 from configglue.schema import (
     BoolOption,
     ListOption,
 
=== modified file 'configglue/glue.py'
--- configglue/glue.py	2013-05-25 15:21:04 +0000
+++ configglue/glue.py	2013-07-11 19:08:28 +0000
@@ -4,7 +4,7 @@
 #
 # A library for simple, DRY configuration of applications
 #
-# (C) 2009--2011 by Canonical Ltd.
+# (C) 2009--2013 by Canonical Ltd.
 # by John R. Lenton <[e-mail]>
 # and Ricardo Kirkner <[e-mail]>
 #
@@ -16,13 +16,10 @@
 
 import os
 import sys
-from configparser import (
-    NoOptionError,
-    NoSectionError,
-)
 from optparse import OptionParser
 from collections import namedtuple
 
+from ._compat import NoSectionError, NoOptionError
 from .parser import SchemaConfigParser
 
 
 
=== modified file 'configglue/inischema/__init__.py'
--- configglue/inischema/__init__.py	2011-07-17 22:32:16 +0000
+++ configglue/inischema/__init__.py	2013-07-11 19:08:28 +0000
@@ -4,7 +4,7 @@
 #
 # A library for simple, DRY configuration of applications
 #
-# (C) 2009--2011 by Canonical Ltd.
+# (C) 2009--2013 by Canonical Ltd.
 # by John R. Lenton <[e-mail]>
 # and Ricardo Kirkner <[e-mail]>
 #
 
=== modified file 'configglue/inischema/attributed.py'
--- configglue/inischema/attributed.py	2013-05-26 15:07:30 +0000
+++ configglue/inischema/attributed.py	2013-07-11 19:08:28 +0000
@@ -4,7 +4,7 @@
 #
 # A library for simple, DRY configuration of applications
 #
-# (C) 2009--2011 by Canonical Ltd.
+# (C) 2009--2013 by Canonical Ltd.
 # by John R. Lenton <[e-mail]>
 # and Ricardo Kirkner <[e-mail]>
 #
@@ -18,7 +18,8 @@
 AttributtedConfigParser lives here.
 """
 import re
-from configparser import RawConfigParser
+
+from configglue._compat import RawConfigParser
 
 
 marker = object()
 
=== modified file 'configglue/inischema/glue.py'
--- configglue/inischema/glue.py	2013-05-26 15:49:00 +0000
+++ configglue/inischema/glue.py	2013-07-11 19:08:28 +0000
@@ -4,7 +4,7 @@
 #
 # A library for simple, DRY configuration of applications
 #
-# (C) 2009--2011 by Canonical Ltd.
+# (C) 2009--2013 by Canonical Ltd.
 # by John R. Lenton <[e-mail]>
 # and Ricardo Kirkner <[e-mail]>
 #
 
=== modified file 'configglue/inischema/parsers.py'
--- configglue/inischema/parsers.py	2011-07-17 22:32:16 +0000
+++ configglue/inischema/parsers.py	2013-07-11 19:08:28 +0000
@@ -4,7 +4,7 @@
 #
 # A library for simple, DRY configuration of applications
 #
-# (C) 2009--2011 by Canonical Ltd.
+# (C) 2009--2013 by Canonical Ltd.
 # by John R. Lenton <[e-mail]>
 # and Ricardo Kirkner <[e-mail]>
 #
 
=== modified file 'configglue/inischema/typed.py'
--- configglue/inischema/typed.py	2013-05-26 15:48:10 +0000
+++ configglue/inischema/typed.py	2013-07-11 19:08:28 +0000
@@ -4,7 +4,7 @@
 #
 # A library for simple, DRY configuration of applications
 #
-# (C) 2009--2011 by Canonical Ltd.
+# (C) 2009--2013 by Canonical Ltd.
 # by John R. Lenton <[e-mail]>
 # and Ricardo Kirkner <[e-mail]>
 #
 
=== modified file 'configglue/parser.py'
--- configglue/parser.py	2013-07-08 20:10:06 +0000
+++ configglue/parser.py	2013-07-11 19:08:28 +0000
@@ -4,7 +4,7 @@
 #
 # A library for simple, DRY configuration of applications
 #
-# (C) 2009--2011 by Canonical Ltd.
+# (C) 2009--2013 by Canonical Ltd.
 # by John R. Lenton <[e-mail]>
 # and Ricardo Kirkner <[e-mail]>
 #
@@ -21,16 +21,15 @@
 import os
 import re
 
-from configparser import (
+from functools import reduce
+
+from ._compat import BaseConfigParser, text_type, string_types
+from ._compat import (
     DEFAULTSECT,
-    SafeConfigParser as BaseConfigParser,
     InterpolationMissingOptionError,
     NoOptionError,
     NoSectionError,
 )
-from functools import reduce
-
-from configglue._compat import text_type, string_types
 
 
 __all__ = [
@@ -77,8 +76,6 @@
         self._basedir = ''
         self._dirty = collections.defaultdict(
             lambda: collections.defaultdict(dict))
-        # map to location in configparser
-        self._KEYCRE = self._interpolation._KEYCRE
 
     def is_valid(self, report=False):
         """Return if the state of the parser is valid.
@@ -386,7 +383,7 @@
             keys = [self._extract_interpolation_keys(x) for x in item]
             keys = reduce(set.union, keys, set())
         else:
-            keys = set(self._KEYCRE.findall(item))
+            keys = set(self._interpolation._KEYCRE.findall(item))
         # remove invalid key
         if '' in keys:
             keys.remove('')
 
=== modified file 'configglue/schema.py'
--- configglue/schema.py	2013-05-26 19:07:46 +0000
+++ configglue/schema.py	2013-07-11 19:08:28 +0000
@@ -4,7 +4,7 @@
 #
 # A library for simple, DRY configuration of applications
 #
-# (C) 2009--2011 by Canonical Ltd.
+# (C) 2009--2013 by Canonical Ltd.
 # by John R. Lenton <[e-mail]>
 # and Ricardo Kirkner <[e-mail]>
 #
@@ -16,14 +16,12 @@
 from __future__ import unicode_literals
 
 import json
-from configparser import (
-    NoSectionError,
-    NoOptionError,
-)
 from copy import deepcopy
 from inspect import getmembers
 
-from configglue._compat import text_type, string_types
+from ._compat import text_type, string_types
+from ._compat import NoSectionError, NoOptionError
+
 
 
 __all__ = [
 
=== modified file 'configglue/tests/__init__.py'
--- configglue/tests/__init__.py	2011-07-17 22:32:16 +0000
+++ configglue/tests/__init__.py	2013-07-11 19:08:28 +0000
@@ -4,7 +4,7 @@
 #
 # A library for simple, DRY configuration of applications
 #
-# (C) 2009--2011 by Canonical Ltd.
+# (C) 2009--2013 by Canonical Ltd.
 # by John R. Lenton <[e-mail]>
 # and Ricardo Kirkner <[e-mail]>
 #
 
=== modified file 'configglue/tests/app/test_base.py'
--- configglue/tests/app/test_base.py	2013-05-26 16:20:41 +0000
+++ configglue/tests/app/test_base.py	2013-07-11 19:08:28 +0000
@@ -4,7 +4,7 @@
 #
 # A library for simple, DRY configuration of applications
 #
-# (C) 2009--2011 by Canonical Ltd.
+# (C) 2009--2013 by Canonical Ltd.
 # by John R. Lenton <[e-mail]>
 # and Ricardo Kirkner <[e-mail]>
 #
 
=== modified file 'configglue/tests/app/test_plugin.py'
--- configglue/tests/app/test_plugin.py	2011-07-17 22:32:16 +0000
+++ configglue/tests/app/test_plugin.py	2013-07-11 19:08:28 +0000
@@ -4,7 +4,7 @@
 #
 # A library for simple, DRY configuration of applications
 #
-# (C) 2009--2011 by Canonical Ltd.
+# (C) 2009--2013 by Canonical Ltd.
 # by John R. Lenton <[e-mail]>
 # and Ricardo Kirkner <[e-mail]>
 #
 
=== modified file 'configglue/tests/inischema/__init__.py'
--- configglue/tests/inischema/__init__.py	2011-07-17 22:32:16 +0000
+++ configglue/tests/inischema/__init__.py	2013-07-11 19:08:28 +0000
@@ -4,7 +4,7 @@
 #
 # A library for simple, DRY configuration of applications
 #
-# (C) 2009--2011 by Canonical Ltd.
+# (C) 2009--2013 by Canonical Ltd.
 # by John R. Lenton <[e-mail]>
 # and Ricardo Kirkner <[e-mail]>
 #
 
=== modified file 'configglue/tests/inischema/test_attributed.py'
--- configglue/tests/inischema/test_attributed.py	2013-05-26 16:15:48 +0000
+++ configglue/tests/inischema/test_attributed.py	2013-07-11 19:08:28 +0000
@@ -4,7 +4,7 @@
 #
 # A library for simple, DRY configuration of applications
 #
-# (C) 2009--2011 by Canonical Ltd.
+# (C) 2009--2013 by Canonical Ltd.
 # by John R. Lenton <[e-mail]>
 # and Ricardo Kirkner <[e-mail]>
 #
@@ -19,9 +19,9 @@
 # runner's output, so pylint: disable-msg=C0111
 
 import unittest
-from configparser import RawConfigParser
 from io import StringIO
 
+from configglue._compat import RawConfigParser
 from configglue.inischema.attributed import AttributedConfigParser
 
 
 
=== modified file 'configglue/tests/inischema/test_glue.py'
--- configglue/tests/inischema/test_glue.py	2013-05-26 19:07:46 +0000
+++ configglue/tests/inischema/test_glue.py	2013-07-11 19:08:28 +0000
@@ -4,7 +4,7 @@
 #
 # A library for simple, DRY configuration of applications
 #
-# (C) 2009--2011 by Canonical Ltd.
+# (C) 2009--2013 by Canonical Ltd.
 # by John R. Lenton <[e-mail]>
 # and Ricardo Kirkner <[e-mail]>
 #
 
=== modified file 'configglue/tests/inischema/test_glue2glue.py'
--- configglue/tests/inischema/test_glue2glue.py	2013-05-26 16:15:48 +0000
+++ configglue/tests/inischema/test_glue2glue.py	2013-07-11 19:08:28 +0000
@@ -5,7 +5,7 @@
 #
 # A library for simple, DRY configuration of applications
 #
-# (C) 2009--2011 by Canonical Ltd.
+# (C) 2009--2013 by Canonical Ltd.
 # by John R. Lenton <[e-mail]>
 # and Ricardo Kirkner <[e-mail]>
 #
 
=== modified file 'configglue/tests/inischema/test_parsers.py'
--- configglue/tests/inischema/test_parsers.py	2011-07-17 22:32:16 +0000
+++ configglue/tests/inischema/test_parsers.py	2013-07-11 19:08:28 +0000
@@ -4,7 +4,7 @@
 #
 # A library for simple, DRY configuration of applications
 #
-# (C) 2009--2011 by Canonical Ltd.
+# (C) 2009--2013 by Canonical Ltd.
 # by John R. Lenton <[e-mail]>
 # and Ricardo Kirkner <[e-mail]>
 #
 
=== modified file 'configglue/tests/inischema/test_typed.py'
--- configglue/tests/inischema/test_typed.py	2013-05-26 16:15:48 +0000
+++ configglue/tests/inischema/test_typed.py	2013-07-11 19:08:28 +0000
@@ -5,7 +5,7 @@
 #
 # A library for simple, DRY configuration of applications
 #
-# (C) 2009--2011 by Canonical Ltd.
+# (C) 2009--2013 by Canonical Ltd.
 # by John R. Lenton <[e-mail]>
 # and Ricardo Kirkner <[e-mail]>
 #
@@ -21,8 +21,8 @@
 
 import unittest
 from io import StringIO
-from configparser import RawConfigParser
 
+from configglue._compat import RawConfigParser
 from configglue.inischema.typed import TypedConfigParser
 
 
 
=== modified file 'configglue/tests/test_contrib_schema.py'
--- configglue/tests/test_contrib_schema.py	2013-05-30 19:48:15 +0000
+++ configglue/tests/test_contrib_schema.py	2013-07-11 19:08:28 +0000
@@ -1,3 +1,18 @@
+###############################################################################
+#
+# configglue -- glue for your apps' configuration
+#
+# A library for simple, DRY configuration of applications
+#
+# (C) 2009--2013 by Canonical Ltd.
+# by John R. Lenton <[e-mail]>
+# and Ricardo Kirkner <[e-mail]>
+#
+# Released under the BSD License (see the file LICENSE)
+#
+# For bug reports, support, and new releases: http://launchpad.net/configglue
+#
+###############################################################################
 from unittest import TestCase
 
 from configglue.schema import ListOption, StringOption
 
=== modified file 'configglue/tests/test_parser.py'
--- configglue/tests/test_parser.py	2013-07-08 20:10:06 +0000
+++ configglue/tests/test_parser.py	2013-07-11 19:08:28 +0000
@@ -5,7 +5,7 @@
 #
 # A library for simple, DRY configuration of applications
 #
-# (C) 2009--2011 by Canonical Ltd.
+# (C) 2009--2013 by Canonical Ltd.
 # by John R. Lenton <[e-mail]>
 # and Ricardo Kirkner <[e-mail]>
 #
@@ -22,13 +22,6 @@
 import tempfile
 import textwrap
 import unittest
-from configparser import (
-    DEFAULTSECT,
-    InterpolationDepthError,
-    InterpolationMissingOptionError,
-    InterpolationSyntaxError,
-    NoSectionError,
-)
 from io import BytesIO
 
 from mock import (
@@ -38,9 +31,16 @@
 )
 
 from configglue._compat import iteritems
+from configglue._compat import (
+    DEFAULTSECT,
+    InterpolationDepthError,
+    InterpolationMissingOptionError,
+    InterpolationSyntaxError,
+    NoOptionError,
+    NoSectionError,
+)
 from configglue.parser import (
     CONFIG_FILE_ENCODING,
-    NoOptionError,
     SchemaConfigParser,
     SchemaValidationError,
 )
@@ -248,8 +248,8 @@
         rawval = '%(bar)'
         vars = {'foo': '%(bar)s', 'bar': 'pepe'}
         parser = SchemaConfigParser(MySchema())
-        self.assertRaises(InterpolationSyntaxError, parser._interpolate,
-            section, option, rawval, vars)
+        self.assertRaises(InterpolationSyntaxError,
+                          parser._interpolate, section, option, rawval, vars)
 
     def test_interpolate_across_sections(self):
         """Test interpolation across sections."""
@@ -278,8 +278,8 @@
         config = BytesIO(b"[foo]\nbar=%(wham)s\n[baz]\nwham=42")
         parser = SchemaConfigParser(MySchema())
         parser.readfp(config)
-        self.assertRaises(InterpolationMissingOptionError, parser.get,
-                          'foo', 'bar')
+        self.assertRaises(InterpolationMissingOptionError,
+                          parser.get, 'foo', 'bar')
 
     @patch('configglue.parser.os')
     def test_interpolate_environment_basic_syntax(self, mock_os):
@@ -592,7 +592,8 @@
         self.assertEqual(set(items), set([('foo', 'bar')]))
 
     def test_items_no_section(self):
-        self.assertRaises(NoSectionError, self.parser.items, '__main__')
+        self.assertRaises(NoSectionError, self.parser.items,
+                          '__main__')
 
     def test_items_raw(self):
         config = BytesIO(b'[__main__]\nfoo=%(baz)s')
@@ -624,8 +625,8 @@
     def test_items_interpolate_error(self):
         config = BytesIO(b'[__main__]\nfoo=%(bar)s')
         self.parser.readfp(config)
-        self.assertRaises(InterpolationMissingOptionError, self.parser.items,
-                          '__main__')
+        self.assertRaises(InterpolationMissingOptionError,
+                          self.parser.items, '__main__')
 
     def test_values_empty_parser(self):
         values = self.parser.values()
@@ -820,12 +821,12 @@
         self.assertEqual(default, expected)
 
     def test_get_default_no_option(self):
-        self.assertRaises(NoOptionError, self.parser._get_default,
-            '__main__', 'bar')
+        self.assertRaises(NoOptionError,
+                          self.parser._get_default, '__main__', 'bar')
 
     def test_get_default_no_section(self):
-        self.assertRaises(NoSectionError, self.parser._get_default,
-            'foo', 'bar')
+        self.assertRaises(NoSectionError,
+                          self.parser._get_default, 'foo', 'bar')
 
     def test_multi_file_dict_config(self):
         """Test parsing a dict option spanning multiple files."""
 
=== modified file 'configglue/tests/test_schema.py'
--- configglue/tests/test_schema.py	2013-05-31 15:26:42 +0000
+++ configglue/tests/test_schema.py	2013-07-11 19:08:28 +0000
@@ -5,7 +5,7 @@
 #
 # A library for simple, DRY configuration of applications
 #
-# (C) 2009--2011 by Canonical Ltd.
+# (C) 2009--2013 by Canonical Ltd.
 # by John R. Lenton <[e-mail]>
 # and Ricardo Kirkner <[e-mail]>
 #
@@ -18,13 +18,10 @@
 
 import textwrap
 import unittest
-from configparser import (
-    NoOptionError,
-    NoSectionError,
-)
 from io import BytesIO
 
 from configglue._compat import text_type
+from configglue._compat import NoOptionError, NoSectionError
 from configglue.parser import (
     SchemaConfigParser,
     SchemaValidationError,
 
=== modified file 'configglue/tests/test_schemaconfig.py'
--- configglue/tests/test_schemaconfig.py	2013-05-26 19:07:46 +0000
+++ configglue/tests/test_schemaconfig.py	2013-07-11 19:08:28 +0000
@@ -5,7 +5,7 @@
 #
 # A library for simple, DRY configuration of applications
 #
-# (C) 2009--2011 by Canonical Ltd.
+# (C) 2009--2013 by Canonical Ltd.
 # by John R. Lenton <[e-mail]>
 # and Ricardo Kirkner <[e-mail]>
 #
@@ -31,14 +31,12 @@
 )
 
 from configglue._compat import PY2
+from configglue._compat import NoSectionError
 from configglue.glue import (
     configglue,
     schemaconfigglue,
 )
-from configglue.parser import (
-    NoSectionError,
-    SchemaConfigParser,
-)
+from configglue.parser import SchemaConfigParser
 from configglue.schema import (
     DictOption,
     IntOption,
 
=== removed directory 'debian'
=== removed file 'debian/changelog'
--- debian/changelog	2012-05-10 12:46:50 +0000
+++ debian/changelog	1970-01-01 00:00:00 +0000
@@ -1,122 +0,0 @@
-python-configglue (1.0.3-0ubuntu2) precise; urgency=low
-
-  * fixed missing renames
-
- -- Ricardo Kirkner <[e-mail]>  Thu, 10 May 2012 12:46:25 +0000
-
-python-configglue (1.0.3-0ubuntu1) precise; urgency=low
-
-  * Provide contributed schemas for applications not providing their own schema
-
- -- Ricardo Kirkner <[e-mail]>  Thu, 10 May 2012 12:27:19 +0000
-
-python-configglue (1.0.1-0ubuntu1) oneiric; urgency=low
-
-  [Ricardo Kirkner]
-  * updated version for release
-  * support python %(name)s string formatting syntax
-  * some final improvements to the docs
-  * updated docs for the 1.0 release
-  * add support to ListOption to parse json
-  * some small improvements
-  * allow DictOption to be specified in the config using json
-  * log a WARNING when a file could not be read
-  * Better error handling and reporting during configuration validation
-  * simplified option precedence
-  * allow to override App's default option parser
-  * improved equality checks on Option subclasses
-  * added --validate option to App base class to enable config validation
-  * handle different mock versions for backwards compatibility
-  * include testing dependencies as build dependencies
-  * run tests during package build
-  * fixed bug due to incorrect handling of option override precedence when an option is marked as fatal.
-  * Preparing for the 1.0 release.
-  * removed deprecated classes and deprecation warnings
-  * Move configglue.pyschema into configglue to simplify the namespace.
-  * removed dependency on python-xdgapp
-  * added .tox folder to ignore list
-
- -- Ricardo Kirkner <[e-mail]>  Thu, 05 Jan 2012 13:43:07 -0300
-
-python-configglue (0.11.1-0ubuntu1) natty; urgency=low
-
-  [Ricardo Kirkner]
-  * Bug (LP: #733977) support custom names for schema options in optparse
-  * updated documentation
-  * added docs building to the set of tests run by tox
-  * fix bug with parsing extra sections for DictOption and ListOption
-
- -- Ricardo Kirkner <[e-mail]>  Sat, 09 Jul 2011 18:01:46 -0300
-
-python-configglue (0.11-0ubuntu1) natty; urgency=low
-
-  [Ricardo Kirkner]
-  * applied pep8 and pyflakes cleanups
-  * various smaller bug fixes
-  * moved tests into the configglue namespace
-  * added support for running the tests via tox
-  * added support for environment variables
-  * added basic class for simplifying creating configglue-enabled applications
-  * simplified section and option class names
-  * Bug (LP: #757955) fatal kwarg on option does not allow --help on cli for non existing config files
-  * Bug (LP: #793060) TypeError: option values must be strings
-  * Bug (LP: #753395) Update to schema definition syntax
-
- -- Ricardo Kirkner <[e-mail]>  Thu, 23 Jun 2011 20:44:24 -0300
-
-python-configglue (0.10-0ubuntu1) maverick; urgency=low
-
-  [Ricardo Kirkner]
-  * Override ConfigParser.write in SchemaConfigParser, to support writing non-ascii data.
-  * documentation + backwards-compatibility
-  * fixes proper schema inheritance using declarative syntax
-  * all ConfigOption classes have a name attribute
-  * Use SafeConfigParser instead of ConfigParser as this will get deprecated
-  * added debian packaging info directly into the source tree
-  * added test for regression of bug #659178
-
- -- Ricardo Kirkner <[e-mail]>  Mon, 02 May 2011 16:44:35 -0300
-
-python-configglue (0.9.1-0ubuntu1) maverick; urgency=low
-
-  [Ricardo Kirkner]
-  * New upstream release.
-   - simplified setup code to get version
-   - refactored code to remove circular dependencies
-   - Simplified configglue api for a common use case.
-   - Added quickstart guide for getting started
-
- -- Ricardo Kirkner <[e-mail]>  Sun, 20 Feb 2011 19:06:22 -0300
-
-python-configglue (0.9pre1-0ubuntu1) maverick; urgency=low
-
-  [Rick McBride]
-  * New upstream release. Closes (LP: #616477)
-    - fixed broken tests
-    - moved existing code around
-    - initial import of configglue.pyschema (from schemaconfig)
-    - merged changes from Ricardo Kirkner
-    - unified the © headers
-    - worked around circular import that happens when importing pyschema first
-    - schema inheritance fix
-    -added optional arguement to ini2schema for ubuntuone-client
-
-  [Elliot Murphy]
-  * debian/control: bumped standards-version to 3.9.1
-
- -- Rick McBride <[e-mail]>  Wed, 11 Aug 2010 16:43:35 -0400
-
-python-configglue (0.2dev-0ubuntu2) karmic; urgency=low
-
-  * debian/control:
-    + XS-Python-Version changed to >= 2.5 because of absolute imports 
-      (LP: #391451)
-
- -- Andrew Mitchell <[e-mail]>  Wed, 24 Jun 2009 14:35:22 +1200
-
-python-configglue (0.2dev-0ubuntu1) karmic; urgency=low
-
-    * Initial package Closes (LP: #384830)
-
- -- Rick McBride <[e-mail]>  Mon, 15 Jun 2009 14:33:00 -0400
-
 
=== removed file 'debian/compat'
--- debian/compat	2011-02-20 21:53:16 +0000
+++ debian/compat	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-7
 
=== removed file 'debian/control'
--- debian/control	2011-07-23 18:35:20 +0000
+++ debian/control	1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-Source: python-configglue
-Section: python
-Priority: optional
-Maintainer: Ubuntu MOTU Team <[e-mail]>
-XSBC-Original-Maintainer: Ricardo Kirkner <[e-mail]>
-Build-Depends: cdbs,
- debhelper (>= 7.0.14),
- python,
- python-setuptools,
- python-support,
-# needed for building in order to run the tests
- python-mock,
- python-xdg
-Standards-Version: 3.9.1
-
-Package: python-configglue
-Architecture: all
-XB-Python-Version: ${python:Versions}
-Depends: ${misc:Depends}, ${python:Depends},
- python-xdg
-Description: Glues together optparse.OptionParser and ConfigParser.ConfigParser
- Configglue is a library that glues together python's optparse.OptionParser 
- and ConfigParser.ConfigParser, so that the same options can be exported to a
- configuration file and a commandline interface.
 
=== removed file 'debian/copyright'
--- debian/copyright	2011-06-23 23:58:43 +0000
+++ debian/copyright	1970-01-01 00:00:00 +0000
@@ -1,43 +0,0 @@
-This package was debianized by Rick McBride <[e-mail]> on
-Fri, 20 Mar 2009 14:26:00 -0400.
-
-Copyright: 
-
-    Copyright (C) 2009-2011 Canonical
-
-License:
-
-    Upstream Author: John R. Lenton <john lenton at canonical com>
-                     Ricardo Kirkner <ricardo kirkner at canonical com>
-    Project Homepage: https://launchpad.net/configglue
-    Released under the BSD License
-
-    Copyright (C) 2009-2011, Canonical
-    All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are met:
-
-        * Redistributions of source code must retain the above copyright notice,
-          this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above copyright
-          notice, this list of conditions and the following disclaimer in the
-          documentation and/or other materials provided with the distribution.
-        * Neither the name Canonical nor the names of its contributors may be
-          used to endorse or promote products derived from this software without
-          specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-    AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
-    ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE 
-    LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
-    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
-    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
-    POSSIBILITY OF SUCH DAMAGE
-
-    The Debian packaging is (C) 2009-2011, Canonical and is licensed under the
-    BSD license, see above.
 
=== removed file 'debian/pycompat'
--- debian/pycompat	2011-02-20 21:53:16 +0000
+++ debian/pycompat	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-2
 
=== removed file 'debian/rules'
--- debian/rules	2011-07-23 12:15:10 +0000
+++ debian/rules	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-#!/usr/bin/make -f
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-DEB_PYTHON_SYSTEM = pysupport
-include /usr/share/cdbs/1/class/python-distutils.mk
-
-build/python-configglue::
-	python setup.py test
 
=== removed file 'debian/watch'
--- debian/watch	2011-02-20 21:53:16 +0000
+++ debian/watch	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-version=3
-http://pypi.python.org/packages/source/c/configglue/configglue-(.+)\.tar\.gz
 
=== modified file 'setup.py'
--- setup.py	2013-05-27 00:42:51 +0000
+++ setup.py	2013-07-11 19:08:28 +0000
@@ -21,12 +21,9 @@
 )
 
 import configglue
-from configglue._compat import PY2
 
 
 install_requires = ['pyxdg']
-if PY2:
-    install_requires.extend(['configparser'])
 
 
 setup(name='configglue',
 
=== modified file 'tox.ini'
--- tox.ini	2013-05-27 00:42:51 +0000
+++ tox.ini	2013-07-11 19:08:28 +0000
@@ -8,16 +8,6 @@
 commands =
     python setup.py test
 
-[testenv:py26]
-deps =
-    {[testenv]deps}
-    configparser
-
-[testenv:py27]
-deps =
-    {[testenv]deps}
-    configparser
-
 [testenv:docs]
 changedir = doc
 deps =