diff rhodecode/controllers/admin/users.py @ 1824:89efedac4e6c beta

2012 copyrights
author Marcin Kuzminski <marcin@python-works.com>
date Wed, 04 Jan 2012 03:50:07 +0200
parents cf51bbfb120e
children 82a88013a3fd 24d906650cc0
line wrap: on
line diff
--- a/rhodecode/controllers/admin/users.py	Wed Jan 04 03:30:16 2012 +0200
+++ b/rhodecode/controllers/admin/users.py	Wed Jan 04 03:50:07 2012 +0200
@@ -7,7 +7,7 @@
 
     :created_on: Apr 4, 2010
     :author: marcink
-    :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
+    :copyright: (C) 2010-2012 Marcin Kuzminski <marcin@python-works.com>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software: you can redistribute it and/or modify
@@ -29,7 +29,7 @@
 
 from formencode import htmlfill
 from pylons import request, session, tmpl_context as c, url, config
-from pylons.controllers.util import abort, redirect
+from pylons.controllers.util import redirect
 from pylons.i18n.translation import _
 
 from rhodecode.lib.exceptions import DefaultUserException, \
@@ -38,7 +38,7 @@
 from rhodecode.lib.auth import LoginRequired, HasPermissionAllDecorator
 from rhodecode.lib.base import BaseController, render
 
-from rhodecode.model.db import User, UserRepoToPerm, UserToPerm, Permission
+from rhodecode.model.db import User, Permission
 from rhodecode.model.forms import UserForm
 from rhodecode.model.user import UserModel
 from rhodecode.model.meta import Session