diff options
| author | Rodney Ewing <ewing.rj@gmail.com> | 2013-05-28 10:46:46 -0700 |
|---|---|---|
| committer | Rodney Ewing <ewing.rj@gmail.com> | 2013-05-28 10:46:46 -0700 |
| commit | 8087f56b07b11a8abc1f6d5108a70765712cc63d (patch) | |
| tree | 7002a38f819f8ccfc505494c9eb6d6d0ed388f33 /mediagoblin/db/mixin.py | |
| parent | 377db0e7ffdca6ce56041d28eba536ecd3b2a58a (diff) | |
| parent | f9e032212dff4d54de644cb5537bc0bef6d24c7f (diff) | |
| download | mediagoblin-8087f56b07b11a8abc1f6d5108a70765712cc63d.tar.lz mediagoblin-8087f56b07b11a8abc1f6d5108a70765712cc63d.tar.xz mediagoblin-8087f56b07b11a8abc1f6d5108a70765712cc63d.zip | |
Merge remote-tracking branch 'upstream/master' into change_email
Conflicts:
mediagoblin/auth/lib.py
Diffstat (limited to 'mediagoblin/db/mixin.py')
| -rw-r--r-- | mediagoblin/db/mixin.py | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/mediagoblin/db/mixin.py b/mediagoblin/db/mixin.py index e7f66fa1..9f566e36 100644 --- a/mediagoblin/db/mixin.py +++ b/mediagoblin/db/mixin.py @@ -34,7 +34,6 @@ import datetime from werkzeug.utils import cached_property from mediagoblin import mg_globals -from mediagoblin.auth import lib as auth_lib from mediagoblin.media_types import get_media_managers, FileTypeNotSupported from mediagoblin.tools import common, licenses from mediagoblin.tools.text import cleaned_markdown_conversion @@ -42,13 +41,6 @@ from mediagoblin.tools.url import slugify class UserMixin(object): - def check_login(self, password): - """ - See if a user can login with this password - """ - return auth_lib.bcrypt_check_password( - password, self.pw_hash) - @property def bio_html(self): return cleaned_markdown_conversion(self.bio) |