pep8: cleanups

ziggurat_foundations/__init__.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
 __version__ = {'major': 0, 'minor': 7, 'patch': 0}

ziggurat_foundations/exc.py

@@ -1,3 +1,6 @@
+# -*- coding: utf-8 -*-
+
+
 class ZigguratException(Exception):
     def __init__(self, msg, value=None):
         self.msg = msg

ziggurat_foundations/ext/pyramid/get_user.py

@@ -1,6 +1,8 @@
+# -*- coding: utf-8 -*-
 from __future__ import unicode_literals
-import logging
+
 import importlib
+import logging
 
 from ziggurat_foundations.exc import ZigguratException
 from ziggurat_foundations.models.base import get_db_session
@@ -37,7 +39,7 @@ def session_provider_callable(request):
     _tmp = importlib.import_module(parts[0])
     UserModel = getattr(_tmp, parts[1])
 
-    # This function is bundled into the request, so for each request you can 
+    # This function is bundled into the request, so for each request you can
     # do request.user
     def get_user(request):
         userid = request.unauthenticated_userid

ziggurat_foundations/ext/pyramid/sign_in.py

@@ -1,7 +1,9 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
+
 import importlib
 import logging
+
 import pyramid.security
 
 from ziggurat_foundations.exc import ZigguratException

ziggurat_foundations/models/base.py

@@ -1,8 +1,10 @@
+# -*- coding: utf-8 -*-
 from __future__ import unicode_literals
+
 import sqlalchemy as sa
+from zope.deprecation import deprecation
 
 from ziggurat_foundations.exc import ZigguratSessionException
-from zope.deprecation import deprecation
 
 
 class BaseModel(object):

ziggurat_foundations/models/external_identity.py

@@ -1,12 +1,14 @@
+# -*- coding: utf-8 -*-
 from __future__ import unicode_literals
+
 import sqlalchemy as sa
 from sqlalchemy.ext.declarative import declared_attr
 from zope.deprecation import deprecation
 
 from ziggurat_foundations.models.base import BaseModel
+from ziggurat_foundations.models.base import get_db_session
 from ziggurat_foundations.models.services.external_identity import \
     ExternalIdentityService
-from ziggurat_foundations.models.base import get_db_session
 
 __all__ = ['ExternalIdentityMixin']
 

ziggurat_foundations/models/group.py

@@ -1,11 +1,13 @@
+# -*- coding: utf-8 -*-
 from __future__ import unicode_literals
+
 import sqlalchemy as sa
 from sqlalchemy.ext.declarative import declared_attr
 from zope.deprecation import deprecation
 
 from ziggurat_foundations.models.base import BaseModel
-from ziggurat_foundations.models.services.group import GroupService
 from ziggurat_foundations.models.base import get_db_session
+from ziggurat_foundations.models.services.group import GroupService
 
 __all__ = ['GroupMixin']
 

ziggurat_foundations/models/group_permission.py

@@ -1,13 +1,15 @@
+# -*- coding: utf-8 -*-
 from __future__ import unicode_literals
+
 import sqlalchemy as sa
 from sqlalchemy.ext.declarative import declared_attr
 from sqlalchemy.orm import validates
 from zope.deprecation import deprecation
 
 from ziggurat_foundations.models.base import BaseModel
+from ziggurat_foundations.models.base import get_db_session
 from ziggurat_foundations.models.services.group_permission import \
     GroupPermissionService
-from ziggurat_foundations.models.base import get_db_session
 
 __all__ = ['GroupPermissionMixin']
 

ziggurat_foundations/models/group_resource_permission.py

@@ -1,7 +1,10 @@
+# -*- coding: utf-8 -*-
 from __future__ import unicode_literals
+
 import sqlalchemy as sa
 from sqlalchemy.ext.declarative import declared_attr
 from sqlalchemy.orm import validates
+
 from ziggurat_foundations.models.base import BaseModel
 from ziggurat_foundations.models.services.group_resource_permission import \
     GroupResourcePermissionService

ziggurat_foundations/models/resource.py

@@ -1,14 +1,16 @@
+# -*- coding: utf-8 -*-
 from __future__ import unicode_literals
+
 import sqlalchemy as sa
 from sqlalchemy.ext.declarative import declared_attr
 from zope.deprecation import deprecation
 
 from ziggurat_foundations.exc import ZigguratException
 from ziggurat_foundations.models.base import BaseModel
+from ziggurat_foundations.models.base import get_db_session
 from ziggurat_foundations.models.services.resource import ResourceService
 from ziggurat_foundations.models.services.resource_tree import \
     ResourceTreeService
-from ziggurat_foundations.models.base import get_db_session
 
 __all__ = ['ResourceMixin']
 

ziggurat_foundations/models/services/__init__.py

@@ -1,4 +1,6 @@
+# -*- coding: utf-8 -*-
 from __future__ import unicode_literals
+
 from ziggurat_foundations.models.base import get_db_session
 
 

ziggurat_foundations/models/services/external_identity.py

@@ -1,6 +1,8 @@
+# -*- coding: utf-8 -*-
 from __future__ import unicode_literals
-from ziggurat_foundations.models.services import BaseService
+
 from ziggurat_foundations.models.base import get_db_session
+from ziggurat_foundations.models.services import BaseService
 
 __all__ = ['ExternalIdentityService']
 

ziggurat_foundations/models/services/group.py

@@ -1,7 +1,10 @@
+# -*- coding: utf-8 -*-
 from __future__ import unicode_literals
+
 from paginate_sqlalchemy import SqlalchemyOrmPage
-from ziggurat_foundations.models.services import BaseService
+
 from ziggurat_foundations.models.base import get_db_session
+from ziggurat_foundations.models.services import BaseService
 from ziggurat_foundations.permissions import (
     ANY_PERMISSION,
     ALL_PERMISSIONS,

ziggurat_foundations/models/services/group_permission.py

@@ -1,6 +1,8 @@
+# -*- coding: utf-8 -*-
 from __future__ import unicode_literals
-from ziggurat_foundations.models.services import BaseService
+
 from ziggurat_foundations.models.base import get_db_session
+from ziggurat_foundations.models.services import BaseService
 
 __all__ = ['GroupPermissionService']
 

ziggurat_foundations/models/services/group_resource_permission.py

@@ -1,6 +1,8 @@
+# -*- coding: utf-8 -*-
 from __future__ import unicode_literals
-from ziggurat_foundations.models.services import BaseService
+
 from ziggurat_foundations.models.base import get_db_session
+from ziggurat_foundations.models.services import BaseService
 
 __all__ = ['GroupResourcePermissionService']
 

ziggurat_foundations/models/services/resource.py

@@ -1,8 +1,10 @@
+# -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
 import sqlalchemy as sa
-from ziggurat_foundations.models.services import BaseService
+
 from ziggurat_foundations.models.base import get_db_session
+from ziggurat_foundations.models.services import BaseService
 from ziggurat_foundations.permissions import (
     ANY_PERMISSION,
     ALL_PERMISSIONS,
@@ -273,4 +275,4 @@ def lock_resource_for_update(cls, resource_id, db_session):
         query = db_session.query(cls.model)
         query = query.filter(cls.model.resource_id == resource_id)
         query = query.with_for_update()
-        return query.first()
+        return query.first()

ziggurat_foundations/models/services/resource_tree.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
 from ziggurat_foundations import noop

ziggurat_foundations/models/services/resource_tree_postgres.py

@@ -1,16 +1,17 @@
+# -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
 from collections import OrderedDict
 
 import sqlalchemy as sa
+
 from ziggurat_foundations import noop
 from ziggurat_foundations.exc import (
     ZigguratResourceTreeMissingException,
     ZigguratResourceTreePathException,
     ZigguratResourceOutOfBoundaryException
 )
 from ziggurat_foundations.models.base import get_db_session
-
 from ziggurat_foundations.models.services.resource import ResourceService
 
 __all__ = ['ResourceTreeServicePostgreSQL']

ziggurat_foundations/models/services/user.py

@@ -1,15 +1,20 @@
+# -*- coding: utf-8 -*-
 from __future__ import unicode_literals
+
 import hashlib
 import random
+import string
+
 import six
 import sqlalchemy as sa
-import string
-from ziggurat_foundations.models.services import BaseService
+
 from ziggurat_foundations.models.base import get_db_session
-from ...permissions import (ANY_PERMISSION,
-                            ALL_PERMISSIONS,
-                            PermissionTuple,
-                            resource_permissions_for_users)
+from ziggurat_foundations.models.services import BaseService
+from ziggurat_foundations.permissions import (
+    ANY_PERMISSION,
+    ALL_PERMISSIONS,
+    PermissionTuple,
+    resource_permissions_for_users)
 
 __all__ = ['UserService']
 

ziggurat_foundations/models/services/user_permission.py

@@ -1,6 +1,8 @@
+# -*- coding: utf-8 -*-
 from __future__ import unicode_literals
-from ziggurat_foundations.models.services import BaseService
+
 from ziggurat_foundations.models.base import get_db_session
+from ziggurat_foundations.models.services import BaseService
 
 __all__ = ['UserPermissionService']
 

ziggurat_foundations/models/services/user_resource_permission.py

@@ -1,6 +1,8 @@
+# -*- coding: utf-8 -*-
 from __future__ import unicode_literals
-from ziggurat_foundations.models.services import BaseService
+
 from ziggurat_foundations.models.base import get_db_session
+from ziggurat_foundations.models.services import BaseService
 
 __all__ = ['UserResourcePermissionService']
 

ziggurat_foundations/models/user.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
 from datetime import datetime
@@ -7,8 +8,8 @@
 from zope.deprecation import deprecation
 
 from ziggurat_foundations.models.base import BaseModel
-from ziggurat_foundations.models.services.user import UserService
 from ziggurat_foundations.models.base import get_db_session
+from ziggurat_foundations.models.services.user import UserService
 
 __all__ = ['UserMixin']
 

ziggurat_foundations/models/user_group.py

@@ -1,6 +1,9 @@
+# -*- coding: utf-8 -*-
 from __future__ import unicode_literals
+
 import sqlalchemy as sa
 from sqlalchemy.ext.declarative import declared_attr
+
 from ziggurat_foundations.models.base import BaseModel
 
 __all__ = ['UserGroupMixin']

ziggurat_foundations/models/user_permission.py

@@ -1,13 +1,15 @@
+# -*- coding: utf-8 -*-
 from __future__ import unicode_literals
+
 import sqlalchemy as sa
 from sqlalchemy.ext.declarative import declared_attr
 from sqlalchemy.orm import validates
 from zope.deprecation import deprecation
 
 from ziggurat_foundations.models.base import BaseModel
+from ziggurat_foundations.models.base import get_db_session
 from ziggurat_foundations.models.services.user_permission import \
     UserPermissionService
-from ziggurat_foundations.models.base import get_db_session
 
 __all__ = ['UserPermissionMixin']
 

ziggurat_foundations/models/user_resource_permission.py

@@ -1,13 +1,15 @@
+# -*- coding: utf-8 -*-
 from __future__ import unicode_literals
+
 import sqlalchemy as sa
 from sqlalchemy.ext.declarative import declared_attr
 from sqlalchemy.orm import validates
 from zope.deprecation import deprecation
 
 from ziggurat_foundations.models.base import BaseModel
+from ziggurat_foundations.models.base import get_db_session
 from ziggurat_foundations.models.services.user_resource_permission import \
     UserResourcePermissionService
-from ziggurat_foundations.models.base import get_db_session
 
 __all__ = ['UserResourcePermissionMixin']
 

ziggurat_foundations/permissions.py

@@ -1,5 +1,9 @@
-import sqlalchemy as sa
+# -*- coding: utf-8 -*-
+
 from collections import namedtuple
+
+import sqlalchemy as sa
+
 from .models.base import get_db_session
 
 try:

ziggurat_foundations/tests/__init__.py

@@ -98,6 +98,7 @@ def create_default_tree(db_session):
         db_session, -3, 'root c', ordering=3)
     return [root, root_b, root_c]
 
+
 class BaseTestCase(object):
     def set_up_user_group_and_perms(self, db_session):
         """

ziggurat_foundations/tests/conftest.py

@@ -2,27 +2,26 @@
 from __future__ import absolute_import, unicode_literals
 
 import os
-import pytest
 
-from alembic.config import Config
+import pytest
 from alembic import command
-
-from sqlalchemy.orm import sessionmaker
+from alembic.config import Config
 from sqlalchemy import create_engine
 from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy.orm import sessionmaker
 
 from ziggurat_foundations import ziggurat_model_init
-from ziggurat_foundations.models.user import UserMixin
+from ziggurat_foundations.models.external_identity import ExternalIdentityMixin
 from ziggurat_foundations.models.group import GroupMixin
 from ziggurat_foundations.models.group_permission import GroupPermissionMixin
-from ziggurat_foundations.models.user_permission import UserPermissionMixin
-from ziggurat_foundations.models.user_group import UserGroupMixin
-from ziggurat_foundations.models.user_resource_permission import \
-    UserResourcePermissionMixin
 from ziggurat_foundations.models.group_resource_permission import \
     GroupResourcePermissionMixin
 from ziggurat_foundations.models.resource import ResourceMixin
-from ziggurat_foundations.models.external_identity import ExternalIdentityMixin
+from ziggurat_foundations.models.user import UserMixin
+from ziggurat_foundations.models.user_group import UserGroupMixin
+from ziggurat_foundations.models.user_permission import UserPermissionMixin
+from ziggurat_foundations.models.user_resource_permission import \
+    UserResourcePermissionMixin
 from ziggurat_foundations.permissions import ALL_PERMISSIONS, Allow
 
 not_postgres = 'postgres' not in os.environ.get("DB_STRING", '').lower()
@@ -122,6 +121,7 @@ def teardown():
 
     return session
 
+
 @pytest.fixture
 def db_session2(request):
     sql_str = os.environ.get("DB_STRING2", 'sqlite://', )
@@ -151,4 +151,4 @@ def teardown():
 
     request.addfinalizer(teardown)
 
-    return session
+    return session