# HG changeset patch # User Mads Kiilerich # Date 1564875983 -7200 # Node ID ff764c0e7792b62ec6be83c5539fd0e15101ab98 # Parent f73a1103ccdcce9b96f551312d0ccdf5a141f6e7 flake8: fix E122 continuation line missing indentation or outdented diff -r f73a1103ccdc -r ff764c0e7792 kallithea/lib/db_manage.py --- a/kallithea/lib/db_manage.py Sun Aug 04 01:37:08 2019 +0200 +++ b/kallithea/lib/db_manage.py Sun Aug 04 01:46:23 2019 +0200 @@ -201,10 +201,10 @@ else: log.info('creating admin and regular test users') from kallithea.tests.base import TEST_USER_ADMIN_LOGIN, \ - TEST_USER_ADMIN_PASS, TEST_USER_ADMIN_EMAIL, \ - TEST_USER_REGULAR_LOGIN, TEST_USER_REGULAR_PASS, \ - TEST_USER_REGULAR_EMAIL, TEST_USER_REGULAR2_LOGIN, \ - TEST_USER_REGULAR2_PASS, TEST_USER_REGULAR2_EMAIL + TEST_USER_ADMIN_PASS, TEST_USER_ADMIN_EMAIL, \ + TEST_USER_REGULAR_LOGIN, TEST_USER_REGULAR_PASS, \ + TEST_USER_REGULAR_EMAIL, TEST_USER_REGULAR2_LOGIN, \ + TEST_USER_REGULAR2_PASS, TEST_USER_REGULAR2_EMAIL self.create_user(TEST_USER_ADMIN_LOGIN, TEST_USER_ADMIN_PASS, TEST_USER_ADMIN_EMAIL, True) diff -r f73a1103ccdc -r ff764c0e7792 kallithea/lib/helpers.py --- a/kallithea/lib/helpers.py Sun Aug 04 01:37:08 2019 +0200 +++ b/kallithea/lib/helpers.py Sun Aug 04 01:46:23 2019 +0200 @@ -770,52 +770,52 @@ # action : translated str, callback(extractor), icon action_map = { - 'user_deleted_repo': (_('[deleted] repository'), - None, 'icon-trashcan'), - 'user_created_repo': (_('[created] repository'), - None, 'icon-plus'), - 'user_created_fork': (_('[created] repository as fork'), - None, 'icon-fork'), - 'user_forked_repo': (_('[forked] repository'), - get_fork_name, 'icon-fork'), - 'user_updated_repo': (_('[updated] repository'), - None, 'icon-pencil'), - 'user_downloaded_archive': (_('[downloaded] archive from repository'), - get_archive_name, 'icon-download-cloud'), - 'admin_deleted_repo': (_('[delete] repository'), - None, 'icon-trashcan'), - 'admin_created_repo': (_('[created] repository'), - None, 'icon-plus'), - 'admin_forked_repo': (_('[forked] repository'), - None, 'icon-fork'), - 'admin_updated_repo': (_('[updated] repository'), - None, 'icon-pencil'), - 'admin_created_user': (_('[created] user'), - get_user_name, 'icon-user'), - 'admin_updated_user': (_('[updated] user'), - get_user_name, 'icon-user'), - 'admin_created_users_group': (_('[created] user group'), - get_users_group, 'icon-pencil'), - 'admin_updated_users_group': (_('[updated] user group'), - get_users_group, 'icon-pencil'), - 'user_commented_revision': (_('[commented] on revision in repository'), - get_cs_links, 'icon-comment'), - 'user_commented_pull_request': (_('[commented] on pull request for'), - get_pull_request, 'icon-comment'), - 'user_closed_pull_request': (_('[closed] pull request for'), - get_pull_request, 'icon-ok'), - 'push': (_('[pushed] into'), - get_cs_links, 'icon-move-up'), - 'push_local': (_('[committed via Kallithea] into repository'), - get_cs_links, 'icon-pencil'), - 'push_remote': (_('[pulled from remote] into repository'), - get_cs_links, 'icon-move-up'), - 'pull': (_('[pulled] from'), - None, 'icon-move-down'), - 'started_following_repo': (_('[started following] repository'), - None, 'icon-heart'), - 'stopped_following_repo': (_('[stopped following] repository'), - None, 'icon-heart-empty'), + 'user_deleted_repo': (_('[deleted] repository'), + None, 'icon-trashcan'), + 'user_created_repo': (_('[created] repository'), + None, 'icon-plus'), + 'user_created_fork': (_('[created] repository as fork'), + None, 'icon-fork'), + 'user_forked_repo': (_('[forked] repository'), + get_fork_name, 'icon-fork'), + 'user_updated_repo': (_('[updated] repository'), + None, 'icon-pencil'), + 'user_downloaded_archive': (_('[downloaded] archive from repository'), + get_archive_name, 'icon-download-cloud'), + 'admin_deleted_repo': (_('[delete] repository'), + None, 'icon-trashcan'), + 'admin_created_repo': (_('[created] repository'), + None, 'icon-plus'), + 'admin_forked_repo': (_('[forked] repository'), + None, 'icon-fork'), + 'admin_updated_repo': (_('[updated] repository'), + None, 'icon-pencil'), + 'admin_created_user': (_('[created] user'), + get_user_name, 'icon-user'), + 'admin_updated_user': (_('[updated] user'), + get_user_name, 'icon-user'), + 'admin_created_users_group': (_('[created] user group'), + get_users_group, 'icon-pencil'), + 'admin_updated_users_group': (_('[updated] user group'), + get_users_group, 'icon-pencil'), + 'user_commented_revision': (_('[commented] on revision in repository'), + get_cs_links, 'icon-comment'), + 'user_commented_pull_request': (_('[commented] on pull request for'), + get_pull_request, 'icon-comment'), + 'user_closed_pull_request': (_('[closed] pull request for'), + get_pull_request, 'icon-ok'), + 'push': (_('[pushed] into'), + get_cs_links, 'icon-move-up'), + 'push_local': (_('[committed via Kallithea] into repository'), + get_cs_links, 'icon-pencil'), + 'push_remote': (_('[pulled from remote] into repository'), + get_cs_links, 'icon-move-up'), + 'pull': (_('[pulled] from'), + None, 'icon-move-down'), + 'started_following_repo': (_('[started following] repository'), + None, 'icon-heart'), + 'stopped_following_repo': (_('[stopped following] repository'), + None, 'icon-heart-empty'), } action_str = action_map.get(action, action) diff -r f73a1103ccdc -r ff764c0e7792 kallithea/lib/page.py --- a/kallithea/lib/page.py Sun Aug 04 01:37:08 2019 +0200 +++ b/kallithea/lib/page.py Sun Aug 04 01:46:23 2019 +0200 @@ -164,7 +164,7 @@ or HTML.a(symbol_previous)), 'link_next': HTML.li(self.next_page and self._pagerlink(self.next_page, symbol_next) - or HTML.a(symbol_next)) + or HTML.a(symbol_next)), }) return literal(result)