Python 3 support

.travis.yml

@@ -24,6 +24,9 @@ env:
 python:
     - 2.6
     - 2.7
+    - 3.3
+    - 3.4
+    - 3.5
 
 
 install:

configman/__init__.py

@@ -1,7 +1,7 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
+from __future__ import absolute_import, division, print_function
 from os import path
 with open(path.join(path.dirname(__file__), 'version.txt')) as f:
     __version__ = f.read().strip()

configman/commandline.py

@@ -7,6 +7,7 @@
 
 # at which point we want to make argparse the default, we will eliminate
 # this line
+from __future__ import absolute_import, division, print_function
 import getopt as command_line
 
 try:

configman/config_exceptions.py

@@ -1,6 +1,7 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+from __future__ import absolute_import, division, print_function
 
 
 class ConfigmanException(Exception):

configman/config_file_future_proxy.py

@@ -1,6 +1,7 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+from __future__ import absolute_import, division, print_function
 
 
 #==============================================================================

configman/config_manager.py

@@ -1,7 +1,9 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+from __future__ import absolute_import, division, print_function
 
+import six
 import sys
 import os
 import collections
@@ -20,6 +22,7 @@
 )
 from configman.converters import (
     to_string_converters,
+    to_str
 )
 from configman.config_exceptions import (
     NotAnOptionError,
@@ -133,10 +136,12 @@ def __init__(
             definition_source_list = []
         elif (
             isinstance(definition_source, collections.Sequence) and
-            not isinstance(definition_source, basestring)
+            not isinstance(definition_source, (six.binary_type, six.text_type))
         ):
             definition_source_list = list(definition_source)
         else:
+            if isinstance(definition_source, (six.binary_type, six.text_type)):
+                definition_source = to_str(definition_source)
             definition_source_list = [definition_source]
 
         if argv_source is None:
@@ -339,28 +344,30 @@ def output_summary(self, output_stream=sys.stdout):
 
         parameters:
             output_stream - an open file-like object suitable for use as the
-                            target of a print statement
+                            target of a print function
         """
         if self.app_name or self.app_description:
-            print >> output_stream, 'Application:',
+            print('Application: ', end='', file=output_stream)
         if self.app_name:
-            print >> output_stream, self.app_name, self.app_version
+            print(self.app_name, self.app_version, file=output_stream)
         if self.app_description:
-            print >> output_stream, self.app_description
+            print(self.app_description, file=output_stream)
         if self.app_name or self.app_description:
-            print >> output_stream, ''
+            print('', file=output_stream)
 
         names_list = self.get_option_names()
-        print >> output_stream, \
+        print(
             "usage:\n%s [OPTIONS]... " % self.app_invocation_name,
+            end='', file=output_stream
+        )
         bracket_count = 0
         # this section prints the non-switch command line arguments
         for key in names_list:
             an_option = self.option_definitions[key]
             if an_option.is_argument:
                 if an_option.default is None:
                     # there's no option, assume the user must set this
-                    print >> output_stream, an_option.name,
+                    print(an_option.name, end='', file=output_stream)
                 elif (
                     inspect.isclass(an_option.value)
                     or inspect.ismodule(an_option.value)
@@ -370,17 +377,17 @@ def output_summary(self, output_stream=sys.stdout):
                     # loaded and we're looking to show the help for it.
                     # display show it as a constant already provided rather
                     # than as an option the user must provide
-                    print >> output_stream, an_option.default,
+                    print(an_option.default, end='', file=output_stream)
                 else:
                     # this is an argument that the user may alternatively
                     # provide
-                    print >> output_stream, "[ %s" % an_option.name,
+                    print("[ %s" % an_option.name, end='', file=output_stream)
                     bracket_count += 1
-        print >> output_stream, ']' * bracket_count, '\n'
+        print(']' * bracket_count, '\n', file=output_stream)
 
         names_list.sort()
         if names_list:
-            print >> output_stream, 'OPTIONS:'
+            print('OPTIONS:', file=output_stream)
 
         pad = ' ' * 4
 
@@ -415,7 +422,7 @@ def output_summary(self, output_stream=sys.stdout):
                     # don't bother with certain dead obvious ones
                     line += '%s(default: %s)\n' % (pad, default)
 
-            print >> output_stream, line
+            print(line, file=output_stream)
 
     #--------------------------------------------------------------------------
     def print_conf(self):
@@ -435,7 +442,7 @@ def stdout_opener():
 
         skip_keys = [
             k for (k, v)
-            in self.option_definitions.iteritems()
+            in six.iteritems(self.option_definitions)
             if isinstance(v, Option) and v.exclude_from_print_conf
         ]
         self.write_conf(config_file_type, stdout_opener, skip_keys=skip_keys)
@@ -458,7 +465,7 @@ def dump_conf(self, config_pathname=None):
 
         skip_keys = [
             k for (k, v)
-            in self.option_definitions.iteritems()
+            in six.iteritems(self.option_definitions)
             if isinstance(v, Option) and v.exclude_from_dump_conf
         ]
 
@@ -706,7 +713,7 @@ def _overlay_expand(self):
                             finished_keys -= set(
                                 all_reference_values[key]
                             )
-                    except KeyError, x:
+                    except KeyError as x:
                         pass  # okay, that source doesn't have this value
 
             # expansion process:
@@ -784,7 +791,7 @@ def _overlay_expand(self):
                     for new_key in new_namespace.keys_breadth_first():
                         if new_key not in current_namespace:
                             current_namespace[new_key] = new_namespace[new_key]
-                except AttributeError, x:
+                except AttributeError as x:
                     # there are apparently no new Options to bring in from
                     # this option's value
                     pass
@@ -831,7 +838,7 @@ def _check_for_mismatches(self, known_keys):
             # remove keys of the form 'y.z' if they match a known key of the
             # form 'x.y.z'
             for key in unmatched_keys.copy():
-                key_is_okay = reduce(
+                key_is_okay = six.moves.reduce(
                     lambda x, y: x or y,
                     (known_key.endswith(key) for known_key in known_keys)
                 )
@@ -852,17 +859,21 @@ def _check_for_mismatches(self, known_keys):
                         )
                 else:
                     warnings.warn(
-                        'Invalid options: %s' % ', '.join(unmatched_keys)
+                        'Invalid options: %s' % ', '.join(sorted(unmatched_keys))
                     )
 
     #--------------------------------------------------------------------------
     @staticmethod
     def _walk_and_close(a_dict):
-        for val in a_dict.itervalues():
+        for val in six.itervalues(a_dict):
             if isinstance(val, collections.Mapping):
                 ConfigurationManager._walk_and_close(val)
-            if hasattr(val, 'close') and not inspect.isclass(val):
-                val.close()
+            try:
+                if hasattr(val, 'close') and not inspect.isclass(val):
+                    val.close()
+            except KeyError:
+                # py3 will sometimes hit KeyError from the hasattr()
+                pass
 
     #--------------------------------------------------------------------------
     def _generate_config(self, mapping_class):