Skip to content

Commit

Permalink
Fix lint
Browse files Browse the repository at this point in the history
  • Loading branch information
guerler committed Nov 23, 2016
1 parent 98c5a59 commit 12623ac
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 8 deletions.
6 changes: 2 additions & 4 deletions lib/galaxy/webapps/galaxy/controllers/user.py
Expand Up @@ -12,19 +12,17 @@
from json import dumps, loads

from markupsafe import escape
from sqlalchemy import and_, or_, true, func
from sqlalchemy import or_, func

from galaxy import model
from galaxy import util
from galaxy import web
from galaxy.util import string_as_bool
from galaxy.exceptions import ObjectInvalid
from galaxy.security.validate_user_input import (transform_publicname,
validate_email,
validate_password,
validate_publicname)
from galaxy.tools.toolbox.filters import FilterFactory
from galaxy.util import biostar, hash_util, docstring_trim, listify
from galaxy.util import biostar, hash_util
from galaxy.web import url_for
from galaxy.web.base.controller import (BaseUIController,
CreatesApiKeysMixin,
Expand Down
9 changes: 5 additions & 4 deletions lib/galaxy/webapps/tool_shed/controllers/user.py
@@ -1,14 +1,15 @@
from markupsafe import escape
from sqlalchemy import and_, or_, true, func
from galaxy import model
from datetime import datetime
from galaxy.web import url_for
from sqlalchemy import and_, true
from galaxy import util
from galaxy import web
from galaxy.webapps.galaxy.controllers.user import User as BaseUser
from galaxy.security.validate_user_input import (transform_publicname,
validate_email,
from galaxy.security.validate_user_input import (validate_email,
validate_password,
validate_publicname)


class User( BaseUser ):

@web.expose
Expand Down

0 comments on commit 12623ac

Please sign in to comment.