From 975f760526cc9be574f81f6f8d3e824c0a898131 Mon Sep 17 00:00:00 2001 From: RhodeCode Admin Date: Mon, 6 Mar 2023 21:51:17 +0100 Subject: [PATCH] python3: removed from future imports --- rhodecode/config/routing_links.py | 2 +- rhodecode/integrations/types/email.py | 2 +- rhodecode/integrations/types/hipchat.py | 2 +- rhodecode/integrations/types/slack.py | 2 +- rhodecode/integrations/types/webhook.py | 2 +- rhodecode/lib/_vendor/authomatic/extras/flask.py | 2 +- rhodecode/lib/_vendor/authomatic/extras/gae/openid.py | 2 +- rhodecode/lib/_vendor/authomatic/providers/openid.py | 2 +- rhodecode/lib/_vendor/authomatic/six.py | 2 +- rhodecode/lib/_vendor/statsd/timer.py | 2 +- rhodecode/lib/diff_match_patch.py | 2 +- rhodecode/lib/feedgenerator/feedgenerator.py | 2 +- rhodecode/lib/index/whoosh.py | 2 +- rhodecode/lib/index/whoosh_fallback_schema.py | 2 +- rhodecode/lib/vcs/utils/helpers.py | 2 +- rhodecode/tests/lib/test_search.py | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/rhodecode/config/routing_links.py b/rhodecode/config/routing_links.py index d3f55c79..89704357 100644 --- a/rhodecode/config/routing_links.py +++ b/rhodecode/config/routing_links.py @@ -44,7 +44,7 @@ The redirection must be first implemented in our servers before you can see it working. """ # pragma: no cover -from __future__ import unicode_literals + link_config = [ { diff --git a/rhodecode/integrations/types/email.py b/rhodecode/integrations/types/email.py index ee6aabb4..12b6e13f 100644 --- a/rhodecode/integrations/types/email.py +++ b/rhodecode/integrations/types/email.py @@ -18,7 +18,7 @@ # RhodeCode Enterprise Edition, including its added features, Support services, # and proprietary license terms, please see https://rhodecode.com/licenses/ -from __future__ import unicode_literals + import logging import colander diff --git a/rhodecode/integrations/types/hipchat.py b/rhodecode/integrations/types/hipchat.py index f3f51b6b..61c516a1 100644 --- a/rhodecode/integrations/types/hipchat.py +++ b/rhodecode/integrations/types/hipchat.py @@ -18,7 +18,7 @@ # RhodeCode Enterprise Edition, including its added features, Support services, # and proprietary license terms, please see https://rhodecode.com/licenses/ -from __future__ import unicode_literals + import deform import logging import requests diff --git a/rhodecode/integrations/types/slack.py b/rhodecode/integrations/types/slack.py index b6a4549d..e5bbe1c2 100644 --- a/rhodecode/integrations/types/slack.py +++ b/rhodecode/integrations/types/slack.py @@ -18,7 +18,7 @@ # RhodeCode Enterprise Edition, including its added features, Support services, # and proprietary license terms, please see https://rhodecode.com/licenses/ -from __future__ import unicode_literals + import re import time import textwrap diff --git a/rhodecode/integrations/types/webhook.py b/rhodecode/integrations/types/webhook.py index d87ffec6..b5771a68 100644 --- a/rhodecode/integrations/types/webhook.py +++ b/rhodecode/integrations/types/webhook.py @@ -18,7 +18,7 @@ # RhodeCode Enterprise Edition, including its added features, Support services, # and proprietary license terms, please see https://rhodecode.com/licenses/ -from __future__ import unicode_literals + import deform.widget import logging diff --git a/rhodecode/lib/_vendor/authomatic/extras/flask.py b/rhodecode/lib/_vendor/authomatic/extras/flask.py index 942813f3..6b7634aa 100755 --- a/rhodecode/lib/_vendor/authomatic/extras/flask.py +++ b/rhodecode/lib/_vendor/authomatic/extras/flask.py @@ -8,7 +8,7 @@ Utilities you can use when using this library with the |flask|_ framework. Thanks to `Mark Steve Samson `_. """ -from __future__ import absolute_import + from functools import wraps from authomatic.adapters import WerkzeugAdapter diff --git a/rhodecode/lib/_vendor/authomatic/extras/gae/openid.py b/rhodecode/lib/_vendor/authomatic/extras/gae/openid.py index 772cf03e..d8911def 100755 --- a/rhodecode/lib/_vendor/authomatic/extras/gae/openid.py +++ b/rhodecode/lib/_vendor/authomatic/extras/gae/openid.py @@ -2,7 +2,7 @@ # We need absolute import to import from openid library which has the same # name as this module -from __future__ import absolute_import + import logging import datetime diff --git a/rhodecode/lib/_vendor/authomatic/providers/openid.py b/rhodecode/lib/_vendor/authomatic/providers/openid.py index 39a62786..77edb839 100755 --- a/rhodecode/lib/_vendor/authomatic/providers/openid.py +++ b/rhodecode/lib/_vendor/authomatic/providers/openid.py @@ -20,7 +20,7 @@ Providers which implement the |openid|_ protocol based on the # We need absolute import to import from openid library which has the same # name as this module -from __future__ import absolute_import + import datetime import logging import time diff --git a/rhodecode/lib/_vendor/authomatic/six.py b/rhodecode/lib/_vendor/authomatic/six.py index 70e7ce49..91787fac 100755 --- a/rhodecode/lib/_vendor/authomatic/six.py +++ b/rhodecode/lib/_vendor/authomatic/six.py @@ -21,7 +21,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -from __future__ import absolute_import + import functools import itertools diff --git a/rhodecode/lib/_vendor/statsd/timer.py b/rhodecode/lib/_vendor/statsd/timer.py index 1e77f2e6..8fa64266 100644 --- a/rhodecode/lib/_vendor/statsd/timer.py +++ b/rhodecode/lib/_vendor/statsd/timer.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import, division, unicode_literals + import functools from time import perf_counter as time_now diff --git a/rhodecode/lib/diff_match_patch.py b/rhodecode/lib/diff_match_patch.py index d351abd3..c063ad88 100644 --- a/rhodecode/lib/diff_match_patch.py +++ b/rhodecode/lib/diff_match_patch.py @@ -1,5 +1,5 @@ -from __future__ import division + """Diff Match and Patch diff --git a/rhodecode/lib/feedgenerator/feedgenerator.py b/rhodecode/lib/feedgenerator/feedgenerator.py index 44f7ff59..f92d1d35 100644 --- a/rhodecode/lib/feedgenerator/feedgenerator.py +++ b/rhodecode/lib/feedgenerator/feedgenerator.py @@ -30,7 +30,7 @@ For definitions of the different versions of RSS, see: http://web.archive.org/web/20110718035220/http://diveintomark.org/archives/2004/02/04/incompatible-rss """ -from __future__ import unicode_literals + import datetime from StringIO import StringIO diff --git a/rhodecode/lib/index/whoosh.py b/rhodecode/lib/index/whoosh.py index 112de8ed..da75782d 100644 --- a/rhodecode/lib/index/whoosh.py +++ b/rhodecode/lib/index/whoosh.py @@ -22,7 +22,7 @@ Index schema for RhodeCode """ -from __future__ import absolute_import + import os import re import logging diff --git a/rhodecode/lib/index/whoosh_fallback_schema.py b/rhodecode/lib/index/whoosh_fallback_schema.py index 55d025cb..fb5900da 100644 --- a/rhodecode/lib/index/whoosh_fallback_schema.py +++ b/rhodecode/lib/index/whoosh_fallback_schema.py @@ -23,7 +23,7 @@ Whoosh fallback schema for RhodeCode in case rhodecode_tools defined one is not available """ -from __future__ import absolute_import + from whoosh.analysis import RegexTokenizer, LowercaseFilter from whoosh.formats import Characters diff --git a/rhodecode/lib/vcs/utils/helpers.py b/rhodecode/lib/vcs/utils/helpers.py index 0381bc82..9565fad8 100644 --- a/rhodecode/lib/vcs/utils/helpers.py +++ b/rhodecode/lib/vcs/utils/helpers.py @@ -23,7 +23,7 @@ Utilities aimed to help achieve mostly basic tasks. """ -from __future__ import division + import re import os diff --git a/rhodecode/tests/lib/test_search.py b/rhodecode/tests/lib/test_search.py index c8e750b8..34dc0c2a 100644 --- a/rhodecode/tests/lib/test_search.py +++ b/rhodecode/tests/lib/test_search.py @@ -18,7 +18,7 @@ # RhodeCode Enterprise Edition, including its added features, Support services, # and proprietary license terms, please see https://rhodecode.com/licenses/ -from __future__ import unicode_literals + import time