aboutsummaryrefslogtreecommitdiff
path: root/rhodecode/model/user.py
diff options
context:
space:
mode:
authorMarcin Kuzminski <marcin@python-works.com>2013-03-28 03:34:36 +0100
committerMarcin Kuzminski <marcin@python-works.com>2013-03-28 03:34:36 +0100
commit09fd3f2872f4ff7c42cca696e8afb42d8fb1a259 (patch)
treed8da8ab5637717d0dbbd5f3ef9bf4d295726691c /rhodecode/model/user.py
parentaa0468b7bdbc776dcd821451d3b4645ec13c2293 (diff)
Don't catch all exceptions
--HG-- branch : beta
Diffstat (limited to 'rhodecode/model/user.py')
-rw-r--r--rhodecode/model/user.py18
1 files changed, 9 insertions, 9 deletions
diff --git a/rhodecode/model/user.py b/rhodecode/model/user.py
index d4b69140..401f0adf 100644
--- a/rhodecode/model/user.py
+++ b/rhodecode/model/user.py
@@ -95,7 +95,7 @@ class UserModel(BaseModel):
new_user.api_key = generate_api_key(form_data['username'])
self.sa.add(new_user)
return new_user
- except:
+ except Exception:
log.error(traceback.format_exc())
raise
@@ -244,7 +244,7 @@ class UserModel(BaseModel):
type_=Notification.TYPE_REGISTRATION,
email_kwargs=kw)
- except:
+ except Exception:
log.error(traceback.format_exc())
raise
@@ -268,7 +268,7 @@ class UserModel(BaseModel):
k = 'name'
setattr(user, k, v)
self.sa.add(user)
- except:
+ except Exception:
log.error(traceback.format_exc())
raise
@@ -290,7 +290,7 @@ class UserModel(BaseModel):
setattr(user, k, v)
self.sa.add(user)
return user
- except:
+ except Exception:
log.error(traceback.format_exc())
raise
@@ -311,7 +311,7 @@ class UserModel(BaseModel):
% (user.username, len(repos), ', '.join(repos))
)
self.sa.delete(user)
- except:
+ except Exception:
log.error(traceback.format_exc())
raise
@@ -335,7 +335,7 @@ class UserModel(BaseModel):
log.info('send new password mail to %s' % user_email)
else:
log.debug("password reset email %s not found" % user_email)
- except:
+ except Exception:
log.error(traceback.format_exc())
return False
@@ -358,7 +358,7 @@ class UserModel(BaseModel):
log.info('change password for %s' % user_email)
if new_passwd is None:
raise Exception('unable to generate new password')
- except:
+ except Exception:
log.error(traceback.format_exc())
Session().rollback()
@@ -367,7 +367,7 @@ class UserModel(BaseModel):
_('Your new RhodeCode password:%s') % (new_passwd))
log.info('send new password mail to %s' % user_email)
- except:
+ except Exception:
log.error('Failed to update user password')
log.error(traceback.format_exc())
@@ -400,7 +400,7 @@ class UserModel(BaseModel):
else:
return False
- except:
+ except Exception:
log.error(traceback.format_exc())
auth_user.is_authenticated = False
return False