Py3

.gitignore

@@ -1,9 +1,103 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
 .coverage
-/ve/
-*.pyc
-*.egg-info
-/dist/
-/docs/_build/
-
-/htmlcov/
-/vepypy/
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+.hypothesis/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# pyenv
+.python-version
+
+# celery beat schedule file
+celerybeat-schedule
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+
+# Additional custom rules
+ve/
+.test_repos/

.travis.yml

@@ -1,18 +1,21 @@
+sudo: false
 language: python
 python:
-  - "2.7"
-  - "pypy"
+  - '2.7'
+  - '3.4'
+  - '3.5'
+  - '3.6'
 services:
   - elasticsearch
-install:
+
+before_install:
   - pip install --upgrade pip
+install:
   - pip install -r requirements-dev.txt
-  - pip install -e .
   - pip install coveralls
-  - pip install flake8
 script:
-  - flake8 elasticgit
   - py.test elasticgit -s --cov ./elasticgit
+  - flake8
 after_success:
   - coveralls
 deploy:

MANIFEST.in

@@ -1,6 +1,12 @@
 include LICENSE
 include README.rst
 include VERSION
-include requirements.txt
-include scripts/eg-tools
-recursive-include elasticgit *.py *.txt
+include requirements-dev.txt
+
+recursive-include elasticgit/templates *
+
+recursive-include docs *
+prune docs/build
+
+global-exclude __pycache__
+global-exclude *.py[co]

elasticgit/commands/avro.py

@@ -1,7 +1,7 @@
 from __future__ import absolute_import
 
 from jinja2 import Environment, PackageLoader
-from functools import partial
+from functools import partial, reduce
 import argparse
 import imp
 import json
@@ -20,6 +20,8 @@
     ToolCommand, ToolCommandError, CommandArgument)
 from elasticgit.utils import load_class
 
+from six import exec_
+
 
 def deserialize(data, field_mapping={}, module_name=None):
     """
@@ -61,7 +63,7 @@ def deserialize(data, field_mapping={}, module_name=None):
     else:
         scope = {}
 
-    exec model_code in scope
+    exec_(model_code, scope)
 
     return scope.pop(model_name)
 

elasticgit/commands/gitmodel.py

@@ -1,6 +1,7 @@
 import os
 import glob
 import json
+import sys
 import warnings
 
 from elasticgit.commands.base import ToolCommand, CommandArgument
@@ -9,6 +10,9 @@
 
 from git import Repo
 
+if sys.version_info[0] == 3:
+    unicode = str
+
 
 class NotAGitModelException(Exception):
     pass

elasticgit/commands/resync.py

@@ -3,7 +3,7 @@
 import sys
 import json
 
-from ConfigParser import ConfigParser
+from six.moves.configparser import ConfigParser
 
 from elasticgit import EG
 from elasticgit.commands.base import (

elasticgit/commands/shell.py

@@ -1,3 +1,5 @@
+from __future__ import print_function
+
 import os
 
 from elasticgit.commands.base import ToolCommand, CommandArgument
@@ -84,7 +86,7 @@ def run(self, workdir, models=None, introspect_models=None):
                     found_models = load_models(models)
                     namespace.update(found_models)
                 except ValueError:
-                    print '%s does not look like a models module.' % (models,)
+                    print('%s does not look like a models module.' % (models,))
 
         namespace.update({
             'workspace': EG.workspace(workdir),

elasticgit/commands/tests/test_gitmodel.py

@@ -1,12 +1,13 @@
-import os
 import json
-
-from StringIO import StringIO
+import os
+from contextlib import contextmanager
 from uuid import uuid4
-from elasticgit.commands.gitmodel import MigrateGitModelRepo
+
+from six import StringIO
+
 from elasticgit.commands import avro
+from elasticgit.commands.gitmodel import MigrateGitModelRepo
 from elasticgit.tests.base import ToolBaseTest
-from contextlib import contextmanager
 
 
 class TestMigrateGitModelRepo(ToolBaseTest):

elasticgit/commands/tests/test_resync.py

@@ -1,7 +1,7 @@
 import json
 
-from StringIO import StringIO
-from ConfigParser import ConfigParser
+from six import StringIO
+from six.moves.configparser import ConfigParser
 
 from elasticgit.tests.base import ToolBaseTest, TestPerson
 from elasticgit.commands.resync import ResyncTool, DEFAULT_SECTION

elasticgit/commands/tests/test_version.py

@@ -1,6 +1,7 @@
-from StringIO import StringIO
 import json
 
+from six import StringIO
+
 from elasticgit.models import version_info
 from elasticgit.tests.base import ToolBaseTest
 from elasticgit.commands.version import VersionTool, DEFAULT_FILE_NAME

elasticgit/models.py

@@ -1,14 +1,17 @@
 import sys
 import pkg_resources
 from copy import deepcopy
-from urllib2 import urlparse
 import uuid
 
 from confmodel.config import Config, ConfigField
 from confmodel.errors import ConfigError
 from confmodel.fallbacks import SingleFieldFallback
+from six.moves import urllib
 
 
+if sys.version_info[0] == 3:
+    unicode = str
+
 version_info = {
     'language': 'python',
     'language_version_string': sys.version,
@@ -49,8 +52,8 @@ class TextField(ModelField):
     field_type = 'str'
 
     def clean(self, value):
-        if not isinstance(value, basestring):
-            self.raise_config_error("is not a base string.")
+        if not isinstance(value, str):
+            self.raise_config_error("is not a string.")
         return value
 
 
@@ -116,7 +119,7 @@ class BooleanField(ModelField):
     }
 
     def clean(self, value):
-        if isinstance(value, basestring):
+        if isinstance(value, str):
             return value.strip().lower() not in ('false', '0', '')
         return bool(value)
 
@@ -200,12 +203,12 @@ class URLField(ModelField):
     }
 
     def clean(self, value):
-        if not isinstance(value, basestring):
+        if not isinstance(value, str):
             self.raise_config_error("is not a URL string.")
         # URLs must be bytes, not unicode.
         if isinstance(value, unicode):
             value = value.encode('utf-8')
-        return urlparse.urlparse(value)
+        return urllib.parse.urlparse(value)
 
 
 class UUIDField(TextField):

elasticgit/search.py

@@ -1,12 +1,13 @@
 import os
-from urllib import quote
 
 from git import Repo
 
 from elasticutils import (
     MappingType, Indexable, S as SBase,
     ObjectSearchResults, DictSearchResults, ListSearchResults)
 
+from six.moves import urllib
+
 from elasticgit.utils import introspect_properties
 from elasticgit.storage.remote import RemoteStorageManager
 
@@ -23,7 +24,7 @@ def index_name(prefix, name):
         The name to use for the index.
     :returns: str
     """
-    return '-'.join(map(quote, [prefix, name]))
+    return '-'.join(map(urllib.parse.quote, [prefix, name]))
 
 
 class ModelMappingTypeBase(MappingType):
@@ -235,7 +236,7 @@ def get_repo_indexes(self):
             return []
 
         return map(
-            lambda (ip, r): index_name(ip, r.active_branch_name()),
+            lambda ip, r: index_name(ip, r.active_branch_name()),
             zip(self.index_prefixes, self.repos))
 
     def _clone(self, next_step=None):

elasticgit/storage/local.py

@@ -2,7 +2,7 @@
 import shutil
 import logging
 
-from zope.interface import implements
+from zope.interface import implementer
 
 from git import Repo, Actor
 from git.diff import DiffIndex
@@ -20,6 +20,7 @@ class StorageException(Exception):
     pass
 
 
+@implementer(IStorageManager)
 class StorageManager(object):
     """
     An interface to :py:class:`elasticgit.models.Model` instances stored
@@ -28,8 +29,6 @@ class StorageManager(object):
     :param git.Repo repo:
         The repository to operate on.
     """
-    implements(IStorageManager)
-
     serializer_class = JSONSerializer
 
     def __init__(self, repo):
@@ -124,12 +123,12 @@ def path_info(self, file_path):
                 raise StorageException('%r does not subclass %r' % (
                     model_class, Model))
             return model_class, uuid
-        except ValueError, e:
+        except ValueError as e:
             log.warn('%s does not look like a model file path.' % (
                 file_path,), exc_info=True)
-        except ImportError, e:
+        except ImportError as e:
             log.warn(e, exc_info=True)
-        except StorageException, e:
+        except StorageException as e:
             log.warn(e, exc_info=True)
 
     def load(self, file_path):