diff --git a/.pylintrc b/.pylintrc index d8074d6..2659762 100644 --- a/.pylintrc +++ b/.pylintrc @@ -45,4 +45,3 @@ disable=fixme, use-a-generator, use-dict-literal, wildcard-import, - wrong-import-order, diff --git a/src/wuttaweb/grids/base.py b/src/wuttaweb/grids/base.py index 414844d..2258217 100644 --- a/src/wuttaweb/grids/base.py +++ b/src/wuttaweb/grids/base.py @@ -37,8 +37,8 @@ from paginate_sqlalchemy import SqlalchemyOrmPage from pyramid.renderers import render from webhelpers2.html import HTML -from wuttaweb.util import FieldList, get_model_fields, make_json_safe from wuttjamaican.db.util import UUID +from wuttaweb.util import FieldList, get_model_fields, make_json_safe from wuttaweb.grids.filters import default_sqlalchemy_filters, VerbNotSupported diff --git a/src/wuttaweb/views/master.py b/src/wuttaweb/views/master.py index 0d90f2e..d2086ea 100644 --- a/src/wuttaweb/views/master.py +++ b/src/wuttaweb/views/master.py @@ -34,11 +34,11 @@ from sqlalchemy import orm from pyramid.renderers import render_to_response from webhelpers2.html import HTML +from wuttjamaican.util import get_class_hierarchy from wuttaweb.views.base import View from wuttaweb.util import get_form_data, render_csrf_token from wuttaweb.db import Session from wuttaweb.progress import SessionProgress -from wuttjamaican.util import get_class_hierarchy log = logging.getLogger(__name__)