# HG changeset patch # User RhodeCode Admin # Date 2023-03-06 20:51:17 # Node ID fba394fb48c2626529e432df4e11960693af92fd # Parent d446a94eb43d0092756b2b0a44c3676654417d4a python3: removed from future imports diff --git a/rhodecode/config/routing_links.py b/rhodecode/config/routing_links.py --- a/rhodecode/config/routing_links.py +++ b/rhodecode/config/routing_links.py @@ -44,7 +44,7 @@ The redirection must be first implemente 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 --- 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 --- 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 --- 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 --- 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 --- 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 li 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 --- 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 --- 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|_ # 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 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 --- a/rhodecode/lib/vcs/utils/helpers.py +++ b/rhodecode/lib/vcs/utils/helpers.py @@ -23,7 +23,7 @@ Utilities aimed to help achieve mostly b """ -from __future__ import division + import re import os diff --git a/rhodecode/tests/lib/test_search.py b/rhodecode/tests/lib/test_search.py --- 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