strip: cleanup code.

rhodecode/apps/repository/views/strip.py

@@ -1,6 +1,6 b''
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2011-2017 RhodeCode GmbH
+# Copyright (C) 2017-2017 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
@@ -24,7 +24,7 b' from pyramid.view import view_config'
 from rhodecode.apps._base import RepoAppView
 from rhodecode.lib.auth import (LoginRequired, HasRepoPermissionAnyDecorator,
     NotAnonymous)
-
+from rhodecode.lib.ext_json import json
 
 log = logging.getLogger(__name__)
 
@@ -57,8 +57,7 b' class StripView(RepoAppView):'
     @HasRepoPermissionAnyDecorator('repository.admin')
     @view_config(
         route_name='strip_check', request_method='POST',
-        renderer='json', xhr=True
-    )
+        renderer='json', xhr=True)
     def strip_check(self):
         from rhodecode.lib.vcs.backends.base import EmptyCommit
         data = {}
@@ -71,7 +70,8 b' class StripView(RepoAppView):'
                 if isinstance(data[i], EmptyCommit):
                     data[i] = {'rev': None, 'commit': rp[chset]}
                 else:
-                    data[i] = {'rev': data[i].raw_id, 'branch': data[i].branch, 'author': data[i].author,
+                    data[i] = {'rev': data[i].raw_id, 'branch': data[i].branch,
+                               'author': data[i].author,
                                'comment': data[i].message}
             else:
                 break
@@ -82,12 +82,9 b' class StripView(RepoAppView):'
     @HasRepoPermissionAnyDecorator('repository.admin')
     @view_config(
         route_name='strip_execute', request_method='POST',
-        renderer='json', xhr=True
-    )
+        renderer='json', xhr=True)
     def strip_execute(self):
-
         from rhodecode.model.scm import ScmModel
-        from rhodecode.lib.ext_json import json
 
         c = self.load_default_context()
         user = self._rhodecode_user
@@ -99,12 +96,14 b' class StripView(RepoAppView):'
             if commit['branch'] in data.keys():
                 continue
             try:
-                ScmModel().strip(repo=c.repo_info,
+                ScmModel().strip(
+                    repo=c.repo_info,
                           commit_id=commit['rev'], branch=commit['branch'])
-                log.info('Stripped commit %s from repo `%s` by %s' % (commit['rev'], c.repo_info.repo_name, user))
+                log.info('Stripped commit %s from repo `%s` by %s' % (
+                    commit['rev'], c.repo_info.repo_name, user))
                 data[commit['rev']] = True
-            except Exception, e:
+            except Exception as e:
                 data[commit['rev']] = False
-                log.debug('Stripped commit %s from repo `%s` failed by %s, exeption %s' % (commit['rev'],
-                                                                            c.repo_info.repo_name, user, e.message))
+                log.debug('Stripped commit %s from repo `%s` failed by %s, exeption %s' % (
+                    commit['rev'], self.db_repo_name, user, e.message))
         return data