diff --git a/rhodecode/bin/rhodecode_api.py b/rhodecode/bin/rhodecode_api.py --- a/rhodecode/bin/rhodecode_api.py +++ b/rhodecode/bin/rhodecode_api.py @@ -238,7 +238,7 @@ def main(argv=None): try: margs = dict(map(lambda s: s.split(':', 1), other)) - except: + except Exception: sys.stderr.write('Error parsing arguments \n') sys.exit() diff --git a/rhodecode/config/routing.py b/rhodecode/config/routing.py --- a/rhodecode/config/routing.py +++ b/rhodecode/config/routing.py @@ -41,7 +41,7 @@ def make_map(config): if len(by_id) == 2 and by_id[1].isdigit() and by_id[0] == '': repo_name = Repository.get(by_id[1]).repo_name match_dict['repo_name'] = repo_name - except: + except Exception: pass return is_valid_repo(repo_name, config['base_path']) diff --git a/rhodecode/controllers/admin/admin.py b/rhodecode/controllers/admin/admin.py --- a/rhodecode/controllers/admin/admin.py +++ b/rhodecode/controllers/admin/admin.py @@ -130,7 +130,7 @@ class AdminController(BaseController): c.search_term = request.GET.get('filter') try: users_log = _journal_filter(users_log, c.search_term) - except: + except Exception: # we want this to crash for now raise diff --git a/rhodecode/controllers/admin/repos.py b/rhodecode/controllers/admin/repos.py --- a/rhodecode/controllers/admin/repos.py +++ b/rhodecode/controllers/admin/repos.py @@ -516,7 +516,7 @@ class ReposController(BaseRepoController h.flash(_('Updated repository visibility in public journal'), category='success') Session().commit() - except: + except Exception: h.flash(_('An error occurred during setting this' ' repository in public journal'), category='error') diff --git a/rhodecode/controllers/changeset.py b/rhodecode/controllers/changeset.py --- a/rhodecode/controllers/changeset.py +++ b/rhodecode/controllers/changeset.py @@ -71,7 +71,7 @@ def get_ignore_ws(fid, GET): if ig_ws: try: return int(ig_ws[0].split(':')[-1]) - except: + except Exception: pass return ig_ws_global @@ -124,7 +124,7 @@ def get_line_ctx(fid, GET): try: return int(retval) - except: + except Exception: return 3 diff --git a/rhodecode/controllers/error.py b/rhodecode/controllers/error.py --- a/rhodecode/controllers/error.py +++ b/rhodecode/controllers/error.py @@ -91,7 +91,7 @@ class ErrorController(BaseController): [400, 401, 403, 404, 500]''' try: code = int(code) - except: + except Exception: code = 500 if code == 400: diff --git a/rhodecode/controllers/journal.py b/rhodecode/controllers/journal.py --- a/rhodecode/controllers/journal.py +++ b/rhodecode/controllers/journal.py @@ -207,7 +207,7 @@ class JournalController(BaseController): #filter try: journal = _journal_filter(journal, c.search_term) - except: + except Exception: # we want this to crash for now raise journal = journal.filter(filtering_criterion)\ @@ -231,7 +231,7 @@ class JournalController(BaseController): self.rhodecode_user.user_id) Session.commit() return 'ok' - except: + except Exception: raise HTTPBadRequest() repo_id = request.POST.get('follows_repo_id') @@ -241,7 +241,7 @@ class JournalController(BaseController): self.rhodecode_user.user_id) Session.commit() return 'ok' - except: + except Exception: raise HTTPBadRequest() log.debug('token mismatch %s vs %s' % (cur_token, token)) diff --git a/rhodecode/controllers/pullrequests.py b/rhodecode/controllers/pullrequests.py --- a/rhodecode/controllers/pullrequests.py +++ b/rhodecode/controllers/pullrequests.py @@ -393,7 +393,7 @@ class PullrequestsController(BaseRepoCon try: cur_status = c.statuses[c.pull_request.revisions[0]][0] - except: + except Exception: log.error(traceback.format_exc()) cur_status = 'undefined' if c.pull_request.is_closed() and 0: diff --git a/rhodecode/lib/base.py b/rhodecode/lib/base.py --- a/rhodecode/lib/base.py +++ b/rhodecode/lib/base.py @@ -127,7 +127,7 @@ class BaseVCSController(object): if len(by_id) == 2 and by_id[1].isdigit(): _repo_name = Repository.get(by_id[1]).repo_name data[1] = _repo_name - except: + except Exception: log.debug('Failed to extract repo_name from id %s' % ( traceback.format_exc() ) diff --git a/rhodecode/lib/db_manage.py b/rhodecode/lib/db_manage.py --- a/rhodecode/lib/db_manage.py +++ b/rhodecode/lib/db_manage.py @@ -319,7 +319,7 @@ class DbManage(object): try: self.sa.add(paths) self.sa.commit() - except: + except Exception: self.sa.rollback() raise @@ -339,7 +339,7 @@ class DbManage(object): try: self.sa.add(def_user) self.sa.commit() - except: + except Exception: self.sa.rollback() raise @@ -353,7 +353,7 @@ class DbManage(object): try: self.sa.add(hgsettings3) self.sa.commit() - except: + except Exception: self.sa.rollback() raise diff --git a/rhodecode/lib/helpers.py b/rhodecode/lib/helpers.py --- a/rhodecode/lib/helpers.py +++ b/rhodecode/lib/helpers.py @@ -1140,7 +1140,7 @@ def urlify_commit(text_, repository=None if link_: # wrap not links into final link => link_ newtext = linkify_others(newtext, link_) - except: + except Exception: log.error(traceback.format_exc()) pass diff --git a/rhodecode/lib/middleware/simplegit.py b/rhodecode/lib/middleware/simplegit.py --- a/rhodecode/lib/middleware/simplegit.py +++ b/rhodecode/lib/middleware/simplegit.py @@ -122,7 +122,7 @@ class SimpleGit(BaseVCSController): try: repo_name = self.__get_repository(environ) log.debug('Extracted repo name is %s' % repo_name) - except: + except Exception: return HTTPInternalServerError()(environ, start_response) # quick check if that dir exists... @@ -178,7 +178,7 @@ class SimpleGit(BaseVCSController): if user is None or not user.active: return HTTPForbidden()(environ, start_response) username = user.username - except: + except Exception: log.error(traceback.format_exc()) return HTTPInternalServerError()(environ, start_response) @@ -272,7 +272,7 @@ class SimpleGit(BaseVCSController): try: environ['PATH_INFO'] = self._get_by_id(environ['PATH_INFO']) repo_name = GIT_PROTO_PAT.match(environ['PATH_INFO']).group(1) - except: + except Exception: log.error(traceback.format_exc()) raise diff --git a/rhodecode/lib/middleware/simplehg.py b/rhodecode/lib/middleware/simplehg.py --- a/rhodecode/lib/middleware/simplehg.py +++ b/rhodecode/lib/middleware/simplehg.py @@ -85,7 +85,7 @@ class SimpleHg(BaseVCSController): try: repo_name = environ['REPO_NAME'] = self.__get_repository(environ) log.debug('Extracted repo name is %s' % repo_name) - except: + except Exception: return HTTPInternalServerError()(environ, start_response) # quick check if that dir exists... @@ -141,7 +141,7 @@ class SimpleHg(BaseVCSController): if user is None or not user.active: return HTTPForbidden()(environ, start_response) username = user.username - except: + except Exception: log.error(traceback.format_exc()) return HTTPInternalServerError()(environ, start_response) @@ -229,7 +229,7 @@ class SimpleHg(BaseVCSController): repo_name = '/'.join(environ['PATH_INFO'].split('/')[1:]) if repo_name.endswith('/'): repo_name = repo_name.rstrip('/') - except: + except Exception: log.error(traceback.format_exc()) raise diff --git a/rhodecode/lib/utils.py b/rhodecode/lib/utils.py --- a/rhodecode/lib/utils.py +++ b/rhodecode/lib/utils.py @@ -166,7 +166,7 @@ def action_logger(user, action, repo, ip (action, safe_unicode(repo), user_obj, ipaddr)) if commit: sa.commit() - except: + except Exception: log.error(traceback.format_exc()) raise @@ -486,7 +486,7 @@ def repo2db_mapper(initial_repo_list, re sa.delete(repo) sa.commit() removed.append(repo.repo_name) - except: + except Exception: #don't hold further removals on error log.error(traceback.format_exc()) sa.rollback() @@ -751,7 +751,7 @@ def check_git_version(): ver = '.'.join(ver.split('.')[:3]) try: _ver = StrictVersion(ver) - except: + except Exception: _ver = StrictVersion('0.0.0') stderr = traceback.format_exc() diff --git a/rhodecode/lib/utils2.py b/rhodecode/lib/utils2.py --- a/rhodecode/lib/utils2.py +++ b/rhodecode/lib/utils2.py @@ -573,7 +573,7 @@ def obfuscate_url_pw(engine): _url = sa_url.make_url(engine) if _url.password: _url.password = 'XXXXX' - except: + except Exception: pass return str(_url) @@ -593,7 +593,7 @@ def _extract_extras(env=None): try: rc_extras = json.loads(env['RC_SCM_DATA']) - except: + except Exception: print os.environ print >> sys.stderr, traceback.format_exc() rc_extras = {} diff --git a/rhodecode/lib/vcs/backends/git/repository.py b/rhodecode/lib/vcs/backends/git/repository.py --- a/rhodecode/lib/vcs/backends/git/repository.py +++ b/rhodecode/lib/vcs/backends/git/repository.py @@ -259,7 +259,7 @@ class GitRepository(BaseRepository): or isinstance(revision, int) or is_null(revision)): try: revision = self.revisions[int(revision)] - except: + except Exception: raise ChangesetDoesNotExistError("Revision %s does not exist " "for this repository" % (revision)) diff --git a/rhodecode/model/db.py b/rhodecode/model/db.py --- a/rhodecode/model/db.py +++ b/rhodecode/model/db.py @@ -802,7 +802,7 @@ class Repository(Base, BaseModel): def changeset_cache(self, val): try: self._changeset_cache = json.dumps(val) - except: + except Exception: log.error(traceback.format_exc()) @classmethod diff --git a/rhodecode/model/repo.py b/rhodecode/model/repo.py --- a/rhodecode/model/repo.py +++ b/rhodecode/model/repo.py @@ -318,7 +318,7 @@ class RepoModel(BaseModel): self.__rename_repo(old=org_repo_name, new=new_name) return cur_repo - except: + except Exception: log.error(traceback.format_exc()) raise @@ -419,7 +419,7 @@ class RepoModel(BaseModel): ScmModel(self.sa).toggle_following_repo(new_repo.repo_id, owner.user_id) return new_repo - except: + except Exception: log.error(traceback.format_exc()) raise @@ -475,7 +475,7 @@ class RepoModel(BaseModel): self.__delete_repo(repo) log_delete_repository(old_repo_dict, deleted_by=owner.username) - except: + except Exception: log.error(traceback.format_exc()) raise @@ -586,7 +586,7 @@ class RepoModel(BaseModel): .filter(Statistics.repository == repo).scalar() if obj: self.sa.delete(obj) - except: + except Exception: log.error(traceback.format_exc()) raise diff --git a/rhodecode/model/repos_group.py b/rhodecode/model/repos_group.py --- a/rhodecode/model/repos_group.py +++ b/rhodecode/model/repos_group.py @@ -162,7 +162,7 @@ class ReposGroupModel(BaseModel): self.__create_group(new_repos_group.group_name) return new_repos_group - except: + except Exception: log.error(traceback.format_exc()) raise @@ -283,7 +283,7 @@ class ReposGroupModel(BaseModel): self.__rename_group(old_path, new_path) return repos_group - except: + except Exception: log.error(traceback.format_exc()) raise @@ -292,7 +292,7 @@ class ReposGroupModel(BaseModel): try: self.sa.delete(repos_group) self.__delete_group(repos_group, force_delete) - except: + except Exception: log.error('Error removing repos_group %s' % repos_group) raise diff --git a/rhodecode/model/scm.py b/rhodecode/model/scm.py --- a/rhodecode/model/scm.py +++ b/rhodecode/model/scm.py @@ -321,7 +321,7 @@ class ScmModel(BaseModel): 'stopped_following_repo', RepoTemp(follow_repo_id)) return - except: + except Exception: log.error(traceback.format_exc()) raise @@ -334,7 +334,7 @@ class ScmModel(BaseModel): action_logger(UserTemp(user_id), 'started_following_repo', RepoTemp(follow_repo_id)) - except: + except Exception: log.error(traceback.format_exc()) raise @@ -347,7 +347,7 @@ class ScmModel(BaseModel): try: self.sa.delete(f) return - except: + except Exception: log.error(traceback.format_exc()) raise @@ -356,7 +356,7 @@ class ScmModel(BaseModel): f.user_id = user_id f.follows_user_id = follow_user_id self.sa.add(f) - except: + except Exception: log.error(traceback.format_exc()) raise @@ -473,7 +473,7 @@ class ScmModel(BaseModel): else: repo.pull(clone_uri) self.mark_for_invalidation(repo_name) - except: + except Exception: log.error(traceback.format_exc()) raise @@ -658,7 +658,7 @@ class ScmModel(BaseModel): ver = matches.groups()[0] log.debug('got %s it is rhodecode' % (ver)) _rhodecode_hook = True - except: + except Exception: log.error(traceback.format_exc()) else: # there is no hook in this dir, so we want to create one diff --git a/rhodecode/model/user.py b/rhodecode/model/user.py --- 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 diff --git a/rhodecode/model/users_group.py b/rhodecode/model/users_group.py --- a/rhodecode/model/users_group.py +++ b/rhodecode/model/users_group.py @@ -59,7 +59,7 @@ class UserGroupModel(BaseModel): new.users_group_active = active self.sa.add(new) return new - except: + except Exception: log.error(traceback.format_exc()) raise @@ -82,7 +82,7 @@ class UserGroupModel(BaseModel): setattr(users_group, k, v) self.sa.add(users_group) - except: + except Exception: log.error(traceback.format_exc()) raise @@ -107,7 +107,7 @@ class UserGroupModel(BaseModel): assigned_groups) self.sa.delete(users_group) - except: + except Exception: log.error(traceback.format_exc()) raise @@ -130,7 +130,7 @@ class UserGroupModel(BaseModel): self.sa.add(users_group_member) return users_group_member - except: + except Exception: log.error(traceback.format_exc()) raise @@ -149,7 +149,7 @@ class UserGroupModel(BaseModel): try: self.sa.delete(users_group_member) return True - except: + except Exception: log.error(traceback.format_exc()) raise else: diff --git a/rhodecode/tests/functional/test_admin_repos.py b/rhodecode/tests/functional/test_admin_repos.py --- a/rhodecode/tests/functional/test_admin_repos.py +++ b/rhodecode/tests/functional/test_admin_repos.py @@ -61,7 +61,7 @@ class TestAdminReposController(TestContr #test if repository was created on filesystem try: vcs.get_repo(os.path.join(TESTS_TMP_PATH, repo_name)) - except: + except Exception: self.fail('no repo %s in filesystem' % repo_name) def test_create_hg_non_ascii(self): @@ -94,7 +94,7 @@ class TestAdminReposController(TestContr #test if repository was created on filesystem try: vcs.get_repo(os.path.join(TESTS_TMP_PATH, repo_name)) - except: + except Exception: self.fail('no repo %s in filesystem' % repo_name) def test_create_hg_in_group(self): @@ -134,7 +134,7 @@ class TestAdminReposController(TestContr #test if repository was created on filesystem try: vcs.get_repo(os.path.join(TESTS_TMP_PATH, repo_name_full)) - except: + except Exception: ReposGroupModel().delete(group_name) self.Session().commit() self.fail('no repo %s in filesystem' % repo_name) @@ -172,7 +172,7 @@ class TestAdminReposController(TestContr #test if repository was created on filesystem try: vcs.get_repo(os.path.join(TESTS_TMP_PATH, repo_name)) - except: + except Exception: self.fail('no repo %s in filesystem' % repo_name) def test_create_git_non_ascii(self): @@ -208,7 +208,7 @@ class TestAdminReposController(TestContr #test if repository was created on filesystem try: vcs.get_repo(os.path.join(TESTS_TMP_PATH, repo_name)) - except: + except Exception: self.fail('no repo %s in filesystem' % repo_name) def test_update(self): @@ -246,7 +246,7 @@ class TestAdminReposController(TestContr #test if repository was created on filesystem try: vcs.get_repo(os.path.join(TESTS_TMP_PATH, repo_name)) - except: + except Exception: self.fail('no repo %s in filesystem' % repo_name) response = self.app.delete(url('repo', repo_name=repo_name)) @@ -294,7 +294,7 @@ class TestAdminReposController(TestContr #test if repository was created on filesystem try: vcs.get_repo(os.path.join(TESTS_TMP_PATH, repo_name)) - except: + except Exception: self.fail('no repo %s in filesystem' % repo_name) response = self.app.delete(url('repo', repo_name=repo_name)) diff --git a/rhodecode/tests/scripts/test_concurency.py b/rhodecode/tests/scripts/test_concurency.py --- a/rhodecode/tests/scripts/test_concurency.py +++ b/rhodecode/tests/scripts/test_concurency.py @@ -198,12 +198,12 @@ if __name__ == '__main__': try: METHOD = sys.argv[3] - except: + except Exception: pass try: backend = sys.argv[4] - except: + except Exception: backend = 'hg' if METHOD == 'pull':