# HG changeset patch # User RhodeCode Admin # Date 2023-03-06 22:30:53 # Node ID e51d300dc160273ddbaa6ed32e2664a0d646f6bf # Parent cf2cc3242e567db9c14efadfde2b5ec9149ffac2 python3: fix import configparser diff --git a/rhodecode/apps/ssh_support/lib/backends/__init__.py b/rhodecode/apps/ssh_support/lib/backends/__init__.py --- a/rhodecode/apps/ssh_support/lib/backends/__init__.py +++ b/rhodecode/apps/ssh_support/lib/backends/__init__.py @@ -22,7 +22,7 @@ import os import re import logging import datetime -from pyramid.compat import configparser +import configparser from rhodecode.model.db import Session, User, UserSshKeys from rhodecode.model.scm import ScmModel diff --git a/rhodecode/apps/ssh_support/tests/conftest.py b/rhodecode/apps/ssh_support/tests/conftest.py --- a/rhodecode/apps/ssh_support/tests/conftest.py +++ b/rhodecode/apps/ssh_support/tests/conftest.py @@ -20,7 +20,7 @@ import os import pytest -from pyramid.compat import configparser +import configparser from rhodecode.apps.ssh_support.lib.ssh_wrapper import SshWrapper from rhodecode.lib.utils2 import AttributeDict diff --git a/rhodecode/lib/celerylib/utils.py b/rhodecode/lib/celerylib/utils.py --- a/rhodecode/lib/celerylib/utils.py +++ b/rhodecode/lib/celerylib/utils.py @@ -26,7 +26,7 @@ import time from functools import partial -from pyramid.compat import configparser +import configparser from celery.result import AsyncResult import celery.loaders.base import celery.schedules diff --git a/rhodecode/lib/dbmigrate/migrate/versioning/cfgparse.py b/rhodecode/lib/dbmigrate/migrate/versioning/cfgparse.py --- a/rhodecode/lib/dbmigrate/migrate/versioning/cfgparse.py +++ b/rhodecode/lib/dbmigrate/migrate/versioning/cfgparse.py @@ -2,7 +2,7 @@ Configuration parser module. """ -from ConfigParser import ConfigParser +import configparser from rhodecode.lib.dbmigrate.migrate.versioning.config import * from rhodecode.lib.dbmigrate.migrate.versioning import pathed diff --git a/rhodecode/lib/pyramid_utils.py b/rhodecode/lib/pyramid_utils.py --- a/rhodecode/lib/pyramid_utils.py +++ b/rhodecode/lib/pyramid_utils.py @@ -19,7 +19,7 @@ # and proprietary license terms, please see https://rhodecode.com/licenses/ import os -from pyramid.compat import configparser +import configparser from pyramid.paster import bootstrap as pyramid_bootstrap, setup_logging # pragma: no cover from rhodecode.lib.request import Request diff --git a/rhodecode/lib/system_info.py b/rhodecode/lib/system_info.py --- a/rhodecode/lib/system_info.py +++ b/rhodecode/lib/system_info.py @@ -30,7 +30,7 @@ import pkg_resources import logging import resource -from pyramid.compat import configparser +import configparser log = logging.getLogger(__name__) diff --git a/rhodecode/lib/vcs/backends/git/commit.py b/rhodecode/lib/vcs/backends/git/commit.py --- a/rhodecode/lib/vcs/backends/git/commit.py +++ b/rhodecode/lib/vcs/backends/git/commit.py @@ -24,6 +24,7 @@ GIT commit module import re import stat +import configparser from itertools import chain from io import StringIO @@ -39,7 +40,6 @@ from rhodecode.lib.vcs.nodes import ( FileNode, DirNode, NodeKind, RootNode, SubModuleNode, ChangedFileNodesGenerator, AddedFileNodesGenerator, RemovedFileNodesGenerator, LargeFileNode) -from rhodecode.lib.vcs.compat import configparser class GitCommit(base.BaseCommit): diff --git a/rhodecode/lib/vcs/backends/hg/repository.py b/rhodecode/lib/vcs/backends/hg/repository.py --- a/rhodecode/lib/vcs/backends/hg/repository.py +++ b/rhodecode/lib/vcs/backends/hg/repository.py @@ -24,6 +24,7 @@ HG repository module import os import logging import binascii +import configparser import urllib.request, urllib.parse, urllib.error from zope.cachedescriptors.property import Lazy as LazyProperty @@ -43,7 +44,6 @@ from rhodecode.lib.vcs.backends.hg.inmem from rhodecode.lib.vcs.exceptions import ( EmptyRepositoryError, RepositoryError, TagAlreadyExistError, TagDoesNotExistError, CommitDoesNotExistError, SubrepoMergeError, UnresolvedFilesInRepo) -from rhodecode.lib.vcs.compat import configparser hexlify = binascii.hexlify nullid = "\0" * 20 diff --git a/rhodecode/tests/server_utils.py b/rhodecode/tests/server_utils.py --- a/rhodecode/tests/server_utils.py +++ b/rhodecode/tests/server_utils.py @@ -28,7 +28,7 @@ import configobj import logging from urllib.request import urlopen from urllib.error import URLError -from pyramid.compat import configparser +import configparser from rhodecode.tests import TEST_USER_ADMIN_LOGIN, TEST_USER_ADMIN_PASS