make tests run on python 2.7 and python 3.2

rande · rande · commit da6fa26a15f9 · 2013-09-29T18:05:36.000-04:00
diff --git a/ioc/component.py b/ioc/component.py
@@ -180,7 +180,7 @@ def add_extension(self, name, config):
         self.extensions[name] = config
 
     def get_ids_by_tag(self, name):
-        return [id for id, definition in self.services.iteritems() if definition.has_tag(name)]
+        return [id for id, definition in self.services.items() if definition.has_tag(name)]
 
     def build_container(self, container):
         if self.logger:
@@ -190,7 +190,7 @@ def build_container(self, container):
         container.add("service_container", container)
         self.parameters.set('ioc.extensions', self.extensions.keys())
 
-        for name, config in self.extensions.iteritems():
+        for name, config in self.extensions.items():
             name = "%s.di.Extension" % name
 
             if self.logger:
@@ -208,7 +208,7 @@ def build_container(self, container):
             extension.pre_build(self, container)
 
         # resolve services
-        for id, definition in self.services.iteritems():
+        for id, definition in self.services.items():
             if definition.abstract:
                 continue
 
@@ -221,7 +221,7 @@ def build_container(self, container):
             self.logger.debug("Building container is over!")
             self.logger.debug("Starting resolving all parameters!")
 
-        for name, value in self.parameters.all().iteritems():
+        for name, value in self.parameters.all().items():
             container.parameters.set(
                 name, 
                 self.parameter_resolver.resolve(value, self.parameters)
@@ -310,16 +310,15 @@ def get_instance(self, definition, container):
         return instance
 
     def get_service(self, id, definition, container):
-
-        if self.logger:
-            self.logger.debug("Get service: id=%s, class=%s" % (id, definition.clazz))
-
         if definition.abstract:
             raise ioc.exceptions.AbstractDefinitionInitialization("The ContainerBuiler try to build an abstract definition, id=%s, class=%s" % (id, definition.clazz))
 
         if container.has(id):
             return container.get(id)
 
+        # if self.logger:
+        #     self.logger.debug("Get service: id=%s, class=%s" % (id, definition.clazz))
+
         if id in self.stack:
             if self.logger:
                 self.logger.error("ioc.exceptions.CyclicReference: " + " -> ".join(self.stack) + " -> " + id)
diff --git a/ioc/event.py b/ioc/event.py
@@ -44,7 +44,7 @@ def get_listeners(self, name):
         """
         Return the callables related to name
         """        
-        return map(lambda listener: listener[0], self.listeners[name])
+        return list(map(lambda listener: listener[0], self.listeners[name]))
 
     def add_listener(self, name, listener, priority=0):
         """
diff --git a/ioc/exceptions.py b/ioc/exceptions.py
@@ -1,7 +1,5 @@
 # vim: set fileencoding=utf-8 :
 
-# import exceptions
-
 class UnknownService(Exception):
     pass
 
diff --git a/ioc/extra/command/__init__.py b/ioc/extra/command/__init__.py
@@ -1 +1 @@
-from command import Command, CommandManager, HelpCommand
+from .command import Command, CommandManager, HelpCommand
diff --git a/ioc/extra/command/command.py b/ioc/extra/command/command.py
@@ -60,7 +60,7 @@ def initialize(self, parser):
     def execute(self, args, output):
         
         output.write("Commands available: \n")
-        for name, (parser, command) in self.command_manager.commands.iteritems():
+        for name, (parser, command) in self.command_manager.commands.items():
             output.write(" > % -20s : %s \n" % (name, parser.description))
 
         output.write("\n--\nPython IoC - Thomas Rabaix <thomas.rabaix@gmail.com>\n")
diff --git a/ioc/extra/flask/di.py b/ioc/extra/flask/di.py
@@ -54,10 +54,10 @@ def configure_app_config(self, config, container_builder):
 
         c = config.get_dict('config', {})
 
-        for name, value in defaults.iteritems():
+        for name, value in defaults.items():
             container_builder.parameters.set('ioc.extra.flask.app.%s' % name, c.get(name, value))
 
-        for name, value in c.all().iteritems():
+        for name, value in c.all().items():
             container_builder.parameters.set('ioc.extra.flask.app.%s' % name, c.get(name, value))
             defaults[name] = value
 
@@ -66,7 +66,7 @@ def configure_app_config(self, config, container_builder):
     def configure_blueprint(self, config, container_builder):
         definition = container_builder.get('ioc.extra.flask.app')
 
-        for id, kwargs in config.get_dict('blueprints', {}).all().iteritems():
+        for id, kwargs in config.get_dict('blueprints', {}).all().items():
             definition.add_call('register_blueprint', [ioc.component.Reference(id)], kwargs.all())
 
     def post_build(self, container_builder, container):
@@ -88,11 +88,11 @@ def post_build(self, container_builder, container):
 
             jinja2.loader.loaders.append(app.create_global_jinja_loader())
 
-            for name, value in app.jinja_env.globals.iteritems():
+            for name, value in app.jinja_env.globals.items():
                 if name not in jinja2.globals:
                     jinja2.globals[name] = value                
 
-            for name, value in app.jinja_env.filters.iteritems():
+            for name, value in app.jinja_env.filters.items():
                 if name not in jinja2.filters:
                     jinja2.filters[name] = value                
 
diff --git a/ioc/extra/jinja2/di.py b/ioc/extra/jinja2/di.py
@@ -14,7 +14,7 @@ def load(self, config, container_builder):
         # register template
         # retrieve all extensions and build a valid MapPrefixLoader dict
         mapping = {}
-        for name, config in container_builder.extensions.iteritems():
+        for name, config in container_builder.extensions.items():
             mapping[name] = jinja2.FileSystemLoader([
                 "%s/resources/%s/templates" % (container_builder.parameters.get('project.root_folder'), name),
                 "%s/resources/templates" % os.path.dirname(importlib.import_module(name).__file__),
diff --git a/ioc/extra/redis/__init__.py b/ioc/extra/redis/__init__.py
@@ -1,4 +1,3 @@
-import exceptions
 
 class Manager(object):
     def __init__(self, default=None, connections=None, clients=None):
@@ -16,7 +15,7 @@ def get_connection(self, name=None):
         if name in self.connections:
             return self.connections[name]
 
-        raise exceptions.KeyError('Unable to find the the valid connection')
+        raise KeyError('Unable to find the the valid connection')
 
     def add_client(self, name, client):
         self.clients[name] = client
@@ -26,7 +25,7 @@ def get_default_client(self):
             return self.clients.values()[0]
 
         if not self.default:
-            raise exceptions.KeyError('No default client set')
+            raise KeyError('No default client set')
 
         return self.get_client(self, self.default)
         
@@ -37,4 +36,4 @@ def get_client(self, name=None):
         if name in self.clients:
             return self.clients[name]
 
-        raise exceptions.KeyError('Unable to find the the valid connection')
+        raise KeyError('Unable to find the the valid connection')
diff --git a/ioc/extra/redis/di.py b/ioc/extra/redis/di.py
@@ -17,7 +17,7 @@ def configure_connections(self, config, container_builder):
 
         manager = container_builder.get('ioc.extra.redis')
 
-        for name, parameters in config.get_dict('connections', {}).all().iteritems():
+        for name, parameters in config.get_dict('connections', {}).all().items():
             id = "ioc.extra.redis.connection.%s" % name
             container_builder.add(id, ioc.component.Definition('redis.ConnectionPool', kwargs={
                 'host':             parameters.get('host', 'localhost'),
@@ -32,7 +32,7 @@ def configure_connections(self, config, container_builder):
 
             manager.add_call('add_connection', arguments=[name, ioc.component.Reference(id)])
 
-        for name, parameters in config.get_dict('clients', {}).all().iteritems():
+        for name, parameters in config.get_dict('clients', {}).all().items():
             id_connection = "ioc.extra.redis.connection.%s" % parameters.get('connection')
             id = "ioc.extra.redis.client.%s" % name
 
diff --git a/ioc/extra/redis_wrap/di.py b/ioc/extra/redis_wrap/di.py
@@ -10,5 +10,5 @@ def load(self, config, container_builder):
     def post_build(self, container_builder, container):
         import redis_wrap
 
-        for name, id in container.parameters.get('ioc.extra.redis_wrap.clients').iteritems():
+        for name, id in container.parameters.get('ioc.extra.redis_wrap.clients').items():
             redis_wrap.SYSTEMS[name] = container.get(id)
diff --git a/ioc/helper.py b/ioc/helper.py
@@ -13,24 +13,25 @@ def deepcopy(value):
     We only need to make sure the provided data is a copy per key, object does
     not need to be copied.
     """
+
     if not isinstance(value, (dict, list, tuple)):
         return value
 
     if isinstance(value, dict):
         copy = {}
-        for k, v in value.iteritems():
+        for k, v in value.items():
             copy[k] = deepcopy(v)
 
     if isinstance(value, tuple):
-        copy = range(len(value))
+        copy = list(range(len(value)))
 
         for k in get_keys(list(value)):
             copy[k] = deepcopy(value[k])
 
         copy = tuple(copy)
 
     if isinstance(value, list):
-        copy = range(len(value))
+        copy = list(range(len(value)))
 
         for k in get_keys(value):
             copy[k] = deepcopy(value[k])
@@ -48,7 +49,7 @@ def get_keys(arguments):
         return range(len(arguments))
 
     if isinstance(arguments, (dict)):
-        return arguments.iterkeys()
+        return arguments.keys()
 
     return []
 
@@ -118,7 +119,7 @@ def build(files, logger=None, parameters=None):
 
     container = ioc.component.Container()
 
-    for name, value in parameters.iteritems():
+    for name, value in parameters.items():
         container_builder.parameters.set(name, value)
 
     container_builder.build_container(container)
diff --git a/ioc/loader.py b/ioc/loader.py
@@ -4,11 +4,11 @@
 
 from ioc.component import Definition, Reference, WeakReference
 import ioc.helper, ioc.exceptions
-from misc import OrderedDictYAMLLoader
+from .misc import OrderedDictYAMLLoader
 
 class Loader(object):
     def fix_config(self, config):
-        for key, value in config.iteritems():
+        for key, value in config.items():
             if isinstance(value, dict):
                 config[key] = self.fix_config(value)
 
@@ -22,10 +22,10 @@ def load(self, file, container_builder):
 
         try:
             data = yaml.load(open(file).read(), OrderedDictYAMLLoader)
-        except yaml.scanner.ScannerError, e:
+        except yaml.scanner.ScannerError as e:
             raise ioc.exceptions.LoadingError("file %s, \nerror: %s" % (file, e))
 
-        for extension, config in data.iteritems():
+        for extension, config in data.items():
             if extension in ['parameters', 'services']:
                 continue
 
@@ -35,11 +35,11 @@ def load(self, file, container_builder):
             container_builder.add_extension(extension, self.fix_config(config.copy()))
 
         if 'parameters' in data:
-            for key, value in data['parameters'].iteritems():
+            for key, value in data['parameters'].items():
                 container_builder.parameters.set(key, value)
 
         if 'services' in data:
-            for id, meta in data['services'].iteritems():
+            for id, meta in data['services'].items():
 
                 if 'arguments' not in meta:
                     meta['arguments'] = []
@@ -81,7 +81,7 @@ def load(self, file, container_builder):
                         (call[0], self.set_references(call[1]), self.set_references(call[2]))
                     )
 
-                for tag, options in meta['tags'].iteritems():
+                for tag, options in meta['tags'].items():
                     for option in options:
                         definition.add_tag(tag, option)
 
diff --git a/ioc/locator.py b/ioc/locator.py
@@ -43,8 +43,14 @@ class FileSystemLocator(BaseLocator):
     """
 
     def __init__(self, searchpath):
-        if isinstance(searchpath, basestring):
-            searchpath = [searchpath]
+        
+        try:
+            if isinstance(searchpath, basestring):
+                searchpath = [searchpath]
+        except NameError:
+            if isinstance(searchpath, str):
+                searchpath = [searchpath]
+
         self.searchpath = list(searchpath)
 
     def locate(self, resource):
diff --git a/ioc/misc.py b/ioc/misc.py
@@ -25,8 +25,8 @@ class OrderedDictYAMLLoader(yaml.Loader):
     def __init__(self, *args, **kwargs):
         yaml.Loader.__init__(self, *args, **kwargs)
 
-        self.add_constructor(u'tag:yaml.org,2002:map', type(self).construct_yaml_map)
-        self.add_constructor(u'tag:yaml.org,2002:omap', type(self).construct_yaml_map)
+        self.add_constructor('tag:yaml.org,2002:map', type(self).construct_yaml_map)
+        self.add_constructor('tag:yaml.org,2002:omap', type(self).construct_yaml_map)
 
     def construct_yaml_map(self, node):
         data = OrderedDict()
@@ -46,10 +46,11 @@ def construct_mapping(self, node, deep=False):
             key = self.construct_object(key_node, deep=deep)
             try:
                 hash(key)
-            except TypeError, exc:
+            except TypeError as exc:
                 raise yaml.constructor.ConstructorError('while constructing a mapping',
                     node.start_mark, 'found unacceptable key (%s)' % exc, key_node.start_mark)
             value = self.construct_object(value_node, deep=deep)
             mapping[key] = value
+
         return mapping
 
diff --git a/requirements.txt b/requirements.txt
@@ -1,7 +1,5 @@
 PyYAML
-unittest2
 coverage
 nose
 jinja2
-mailer
-Sphinx==1.1.3
+Sphinx
diff --git a/requirements_python2.txt b/requirements_python2.txt
@@ -0,0 +1,2 @@
+-r requirements.txt
+unittest2
diff --git a/requirements_python3.txt b/requirements_python3.txt
@@ -0,0 +1,2 @@
+-r requirements.txt
+unittest2py3k
diff --git a/tests/ioc/test_component.py b/tests/ioc/test_component.py
@@ -1,7 +1,7 @@
 # vim: set fileencoding=utf-8 :
 
 import unittest2 as unittest
-import ioc.component, ioc.exceptions, exceptions
+import ioc.component, ioc.exceptions
 import tests.ioc.service
 
 class DefinitionTest(unittest.TestCase):
@@ -142,7 +142,7 @@ def setUp(self):
         self.container = ioc.component.ContainerBuilder()
 
     def test_get_class(self):
-        with self.assertRaises(exceptions.AttributeError):
+        with self.assertRaises(AttributeError):
             self.container.get_class(ioc.component.Definition('tests.ioc.test_component.Fake'))
 
         definition = ioc.component.Definition('tests.ioc.service.Fake', [True], {'param': 'salut'})
diff --git a/tests/ioc/test_event.py b/tests/ioc/test_event.py
@@ -2,14 +2,13 @@
 
 import unittest2 as unittest
 import ioc.event
-import exceptions
 
 class EventTest(unittest.TestCase):
     def test_init(self):
         event = ioc.event.Event({'foo': 'bar'})
         self.assertEquals('bar', event.get('foo'))
 
-        with self.assertRaises(exceptions.KeyError):
+        with self.assertRaises(KeyError):
             self.assertEquals('bar', event.get('foo2'))
 
         self.assertFalse(event.has('foo2'))
diff --git a/tests/ioc/test_helper.py b/tests/ioc/test_helper.py
@@ -40,4 +40,15 @@ def test_dict(self):
         config = ioc.helper.Dict()
         managers = config.get_dict('managers', {'foo': 'bar'})
 
-        self.assertEquals(managers.get('foo'), 'bar')
+        self.assertEquals(managers.get('foo'), 'bar')
+
+    def test_deepcopy(self):
+
+        values = [
+            {'sad': 1},
+            ('%tuple%', 2)
+        ]
+
+        for value in values:
+            self.assertEquals(value, ioc.helper.deepcopy(value))
+        
diff --git a/tests/ioc/test_locator.py b/tests/ioc/test_locator.py

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-from command import Command, CommandManager, HelpCommand`
	`1`	`+from .command import Command, CommandManager, HelpCommand`