# HG changeset patch # User Marcin Kuzminski # Date 2017-11-15 19:35:22 # Node ID 1176c026f91a13ee5d6acd10f0c669472d1fdbec # Parent 164d8f965a8aef72eca1e82bb6469c82bf123f75 compat: use py3 compatible configparser in all places. 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 -import ConfigParser +from pyramid.compat import configparser from rhodecode.model.db import Session, User, UserSshKeys from rhodecode.model.scm import ScmModel @@ -51,7 +51,7 @@ class SshWrapper(object): self.server_impl = None def parse_config(self, config_path): - parser = ConfigParser.ConfigParser() + parser = configparser.ConfigParser() parser.read(config_path) return parser 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 -import ConfigParser +from pyramid.compat import configparser from rhodecode.apps.ssh_support.lib.ssh_wrapper import SshWrapper from rhodecode.lib.utils2 import AttributeDict @@ -28,7 +28,7 @@ from rhodecode.lib.utils2 import Attribu @pytest.fixture def dummy_conf_file(tmpdir): - conf = ConfigParser.ConfigParser() + conf = configparser.ConfigParser() conf.add_section('app:main') conf.set('app:main', 'ssh.executable.hg', '/usr/bin/hg') conf.set('app:main', 'ssh.executable.git', '/usr/bin/git') 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,13 +19,13 @@ # and proprietary license terms, please see https://rhodecode.com/licenses/ import os -import ConfigParser -from pyramid.paster import bootstrap as pyramid_bootstrap +from pyramid.compat import configparser +from pyramid.paster import bootstrap as pyramid_bootstrap, setup_logging # noqa from pyramid.request import Request def get_config(ini_path, **kwargs): - parser = ConfigParser.ConfigParser(**kwargs) + parser = configparser.ConfigParser(**kwargs) parser.read(ini_path) return parser @@ -41,7 +41,7 @@ def bootstrap(config_uri, request=None, base_url = 'http://rhodecode.local' try: base_url = config.get('app:main', 'app.base_url') - except (ConfigParser.NoSectionError, ConfigParser.NoOptionError): + except (configparser.NoSectionError, configparser.NoOptionError): pass request = request or Request.blank('/', base_url=base_url) 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 @@ -25,8 +25,8 @@ import time import platform import pkg_resources import logging -import string +from pyramid.compat import configparser log = logging.getLogger(__name__) @@ -555,7 +555,6 @@ def rhodecode_app_info(): def rhodecode_config(): import rhodecode - import ConfigParser as configparser path = rhodecode.CONFIG.get('__file__') rhodecode_ini_safe = rhodecode.CONFIG.copy() 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,11 +24,11 @@ GIT commit module import re import stat -from ConfigParser import ConfigParser from itertools import chain from StringIO import StringIO from zope.cachedescriptors.property import Lazy as LazyProperty +from pyramid.compat import configparser from rhodecode.lib.datelib import utcdate_fromtimestamp from rhodecode.lib.utils import safe_unicode, safe_str @@ -533,7 +533,7 @@ class GitCommit(base.BaseCommit): # ConfigParser fails if there are whitespaces content = '\n'.join(l.strip() for l in content.split('\n')) - parser = ConfigParser() + parser = configparser.ConfigParser() parser.readfp(StringIO(content)) for section in parser.sections():