quick python3 version

.travis.yml

@@ -1,12 +1,9 @@
 language: python
 python:
-  - "2.7"
+  - "3.5"
 
 before_install:
-  - wget -O - http://debian.neo4j.org/neotechnology.gpg.key | sudo apt-key add -
-  - echo 'deb http://debian.neo4j.org/repo stable/' | sudo tee /etc/apt/sources.list.d/neo4j.list
   - sudo apt-get update -qq
-  - sudo apt-get install neo4j=2.0.3
 
 install:
   - python setup.py -q install

requirements.txt

@@ -1 +1 @@
-sqlalchemy>=0.9
+sqlalchemy>=1.0.12

taal/__init__.py

@@ -61,6 +61,9 @@ def __eq__(self, other):
         other_data = (other.context, other.message_id, other.pending_value)
         return self_data == other_data
 
+    def __hash__(self):
+        return hash((self.context, self.message_id, self.pending_value))
+
 
 class TranslationStrategies(object):
     NONE_VALUE = 'NONE_VALUE'
@@ -85,7 +88,6 @@ class Translator(object):
 
     Given a sqlalchemy session, a model to store translations, and
     a language, bind a translator to a(n other) sqlalchemy session
-    and/or a kaiso manager to get translation magic
 
     Language may be either a string, or a callable returning a string, for
     more dynamic behaviour.
@@ -130,16 +132,12 @@ def language(self):
         return self.get_language()
 
     def bind(self, target):
-        """ register e.g. a sqlalchey session or a kaiso manager """
-        from taal.kaiso import manager
 
         if isinstance(target, Session):
             from taal.sqlalchemy.events import (
                 register_translator, register_session)
             register_translator(target, self)
             register_session(target)
-        elif isinstance(target, manager.Manager):
-            manager.register_translator(target, self)
         else:
             raise BindError("Unknown target {}".format(target))
 
@@ -181,7 +179,7 @@ def translate(self, translatable, strategy=None, cache=None):
         elif isinstance(translatable, dict):
             return dict(
                 (key, self.translate(val, strategy=strategy, cache=cache))
-                for key, val in translatable.iteritems()
+                for key, val in translatable.items()
             )
         elif isinstance(translatable, list):
             return list(
@@ -233,7 +231,7 @@ def _collect_translatables(self, translatable, collection=None):
             collection.add((translatable.context, translatable.message_id))
         elif isinstance(translatable, dict):
             [self._collect_translatables(val, collection)
-                for val in translatable.itervalues()]
+                for val in translatable.values()]
         elif isinstance(translatable, list):
             [self._collect_translatables(item, collection)
                 for item in translatable]
@@ -463,7 +461,7 @@ def register(self, context_manager):
         self._registry[context] = context_manager
 
     def list_contexts_and_message_ids(self, **kwargs):
-        for context, context_manager_cls in self._registry.iteritems():
+        for context, context_manager_cls in self._registry.items():
             context_manager = context_manager_cls(**kwargs)
             for message_id in context_manager.list_message_ids():
                 yield (context, message_id)