##// END OF EJS Templates
python3: fix import configparser
super-admin -
r4927:e51d300d default
parent child Browse files
Show More
@@ -22,7 +22,7 b' import os'
22 22 import re
23 23 import logging
24 24 import datetime
25 from pyramid.compat import configparser
25 import configparser
26 26
27 27 from rhodecode.model.db import Session, User, UserSshKeys
28 28 from rhodecode.model.scm import ScmModel
@@ -20,7 +20,7 b''
20 20
21 21 import os
22 22 import pytest
23 from pyramid.compat import configparser
23 import configparser
24 24
25 25 from rhodecode.apps.ssh_support.lib.ssh_wrapper import SshWrapper
26 26 from rhodecode.lib.utils2 import AttributeDict
@@ -26,7 +26,7 b' import time'
26 26
27 27 from functools import partial
28 28
29 from pyramid.compat import configparser
29 import configparser
30 30 from celery.result import AsyncResult
31 31 import celery.loaders.base
32 32 import celery.schedules
@@ -2,7 +2,7 b''
2 2 Configuration parser module.
3 3 """
4 4
5 from ConfigParser import ConfigParser
5 import configparser
6 6
7 7 from rhodecode.lib.dbmigrate.migrate.versioning.config import *
8 8 from rhodecode.lib.dbmigrate.migrate.versioning import pathed
@@ -19,7 +19,7 b''
19 19 # and proprietary license terms, please see https://rhodecode.com/licenses/
20 20
21 21 import os
22 from pyramid.compat import configparser
22 import configparser
23 23 from pyramid.paster import bootstrap as pyramid_bootstrap, setup_logging # pragma: no cover
24 24
25 25 from rhodecode.lib.request import Request
@@ -30,7 +30,7 b' import pkg_resources'
30 30 import logging
31 31 import resource
32 32
33 from pyramid.compat import configparser
33 import configparser
34 34
35 35 log = logging.getLogger(__name__)
36 36
@@ -24,6 +24,7 b' GIT commit module'
24 24
25 25 import re
26 26 import stat
27 import configparser
27 28 from itertools import chain
28 29 from io import StringIO
29 30
@@ -39,7 +40,6 b' from rhodecode.lib.vcs.nodes import ('
39 40 FileNode, DirNode, NodeKind, RootNode, SubModuleNode,
40 41 ChangedFileNodesGenerator, AddedFileNodesGenerator,
41 42 RemovedFileNodesGenerator, LargeFileNode)
42 from rhodecode.lib.vcs.compat import configparser
43 43
44 44
45 45 class GitCommit(base.BaseCommit):
@@ -24,6 +24,7 b' HG repository module'
24 24 import os
25 25 import logging
26 26 import binascii
27 import configparser
27 28 import urllib.request, urllib.parse, urllib.error
28 29
29 30 from zope.cachedescriptors.property import Lazy as LazyProperty
@@ -43,7 +44,6 b' from rhodecode.lib.vcs.backends.hg.inmem'
43 44 from rhodecode.lib.vcs.exceptions import (
44 45 EmptyRepositoryError, RepositoryError, TagAlreadyExistError,
45 46 TagDoesNotExistError, CommitDoesNotExistError, SubrepoMergeError, UnresolvedFilesInRepo)
46 from rhodecode.lib.vcs.compat import configparser
47 47
48 48 hexlify = binascii.hexlify
49 49 nullid = "\0" * 20
@@ -28,7 +28,7 b' import configobj'
28 28 import logging
29 29 from urllib.request import urlopen
30 30 from urllib.error import URLError
31 from pyramid.compat import configparser
31 import configparser
32 32
33 33
34 34 from rhodecode.tests import TEST_USER_ADMIN_LOGIN, TEST_USER_ADMIN_PASS
General Comments 0
You need to be logged in to leave comments. Login now