Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit96ddf19

Browse files
A support of Python 3.8 [import]
This commit fixes a problem with imports.As I understand 3.8 has a problem with import across root-directory and I do not know/find how to fix it correctly.If someone know how to resolve these problems more easily (through sys.path/__init__.py?) - you are welcome!
1 parent1618d7c commit96ddf19

File tree

9 files changed

+166
-67
lines changed

9 files changed

+166
-67
lines changed

‎testgres/plugins/pg_probackup2/pg_probackup2/tests/test_basic.py‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,12 @@
44
importshutil
55
importpytest
66

7-
from ......importtestgres
7+
try:
8+
# Python 3.8
9+
importtestgres
10+
exceptImportError:
11+
from ......importtestgres
12+
813
from ...pg_probackup2.appimportProbackupApp
914
from ...pg_probackup2.init_helpersimportInit,init_params
1015
from ..storage.fs_backupimportFSTestBackupDir

‎tests/helpers/global_data.py‎

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,22 @@
1-
from ...testgres.operations.os_opsimportOsOperations
2-
from ...testgres.operations.os_opsimportConnectionParams
3-
from ...testgres.operations.local_opsimportLocalOperations
4-
from ...testgres.operations.remote_opsimportRemoteOperations
5-
6-
from ...testgres.nodeimportPortManager
7-
from ...testgres.nodeimportPortManager__ThisHost
8-
from ...testgres.nodeimportPortManager__Generic
1+
try:
2+
# Python 3.8
3+
fromtestgres.operations.os_opsimportOsOperations
4+
fromtestgres.operations.os_opsimportConnectionParams
5+
fromtestgres.operations.local_opsimportLocalOperations
6+
fromtestgres.operations.remote_opsimportRemoteOperations
7+
8+
fromtestgres.port_managerimportPortManager
9+
fromtestgres.port_managerimportPortManager__ThisHost
10+
fromtestgres.port_managerimportPortManager__Generic
11+
exceptImportError:
12+
from ...testgres.operations.os_opsimportOsOperations
13+
from ...testgres.operations.os_opsimportConnectionParams
14+
from ...testgres.operations.local_opsimportLocalOperations
15+
from ...testgres.operations.remote_opsimportRemoteOperations
16+
17+
from ...testgres.port_managerimportPortManager
18+
from ...testgres.port_managerimportPortManager__ThisHost
19+
from ...testgres.port_managerimportPortManager__Generic
920

1021
importos
1122

‎tests/test_config.py‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,18 @@
1-
from ..testgresimportTestgresConfig
2-
from ..testgresimportconfigure_testgres
3-
from ..testgresimportscoped_config
4-
from ..testgresimportpop_config
5-
6-
from ..importtestgres
1+
try:
2+
# Python 3.8
3+
importtestgres
4+
5+
fromtestgres.configimportTestgresConfig
6+
fromtestgresimportconfigure_testgres
7+
fromtestgresimportscoped_config
8+
fromtestgresimportpop_config
9+
exceptImportError:
10+
from ..importtestgres
11+
12+
from ..testgres.configimportTestgresConfig
13+
from ..testgresimportconfigure_testgres
14+
from ..testgresimportscoped_config
15+
from ..testgresimportpop_config
716

817
importpytest
918

‎tests/test_os_ops_common.py‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,14 @@
44
from .helpers.global_dataimportOsOperations
55
from .helpers.run_conditionsimportRunConditions
66

7+
try:
8+
# Python 3.8
9+
fromtestgresimportInvalidOperationException
10+
fromtestgresimportExecUtilException
11+
exceptImportError:
12+
from ..testgresimportInvalidOperationException
13+
from ..testgresimportExecUtilException
14+
715
importos
816

917
importpytest
@@ -14,9 +22,6 @@
1422
importthreading
1523
importtyping
1624

17-
from ..testgresimportInvalidOperationException
18-
from ..testgresimportExecUtilException
19-
2025

2126
classTestOsOpsCommon:
2227
sm_os_ops_descrs:typing.List[OsOpsDescr]= [

‎tests/test_os_ops_remote.py‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,11 @@
33
from .helpers.global_dataimportOsOpsDescrs
44
from .helpers.global_dataimportOsOperations
55

6-
from ..testgresimportExecUtilException
6+
try:
7+
# Python 3.8
8+
fromtestgresimportExecUtilException
9+
exceptImportError:
10+
from ..testgresimportExecUtilException
711

812
importos
913
importpytest

‎tests/test_testgres_common.py‎

Lines changed: 50 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,56 @@
33
from .helpers.global_dataimportOsOperations
44
from .helpers.global_dataimportPortManager
55

6-
from ..testgres.nodeimportPgVer
7-
from ..testgres.nodeimportPostgresNode
8-
from ..testgres.utilsimportget_pg_version2
9-
from ..testgres.utilsimportfile_tail
10-
from ..testgres.utilsimportget_bin_path2
11-
from ..testgresimportProcessType
12-
from ..testgresimportNodeStatus
13-
from ..testgresimportIsolationLevel
14-
15-
# New name prevents to collect test-functions in TestgresException and fixes
16-
# the problem with pytest warning.
17-
from ..testgresimportTestgresExceptionastestgres_TestgresException
18-
19-
from ..testgresimportInitNodeException
20-
from ..testgresimportStartNodeException
21-
from ..testgresimportQueryException
22-
from ..testgresimportExecUtilException
23-
from ..testgresimportTimeoutException
24-
from ..testgresimportInvalidOperationException
25-
from ..testgresimportBackupException
26-
from ..testgresimportProgrammingError
27-
from ..testgresimportscoped_config
28-
from ..testgresimportFirst,Any
6+
try:
7+
# Python 3.8
8+
fromtestgres.nodeimportPgVer
9+
fromtestgres.nodeimportPostgresNode
10+
fromtestgres.utilsimportget_pg_version2
11+
fromtestgres.utilsimportfile_tail
12+
fromtestgres.utilsimportget_bin_path2
13+
fromtestgresimportProcessType
14+
fromtestgresimportNodeStatus
15+
fromtestgresimportIsolationLevel
16+
17+
# New name prevents to collect test-functions in TestgresException and fixes
18+
# the problem with pytest warning.
19+
fromtestgresimportTestgresExceptionastestgres_TestgresException
20+
21+
fromtestgresimportInitNodeException
22+
fromtestgresimportStartNodeException
23+
fromtestgresimportQueryException
24+
fromtestgresimportExecUtilException
25+
fromtestgresimportTimeoutException
26+
fromtestgresimportInvalidOperationException
27+
fromtestgresimportBackupException
28+
fromtestgresimportProgrammingError
29+
fromtestgresimportscoped_config
30+
fromtestgresimportFirst,Any
31+
32+
exceptImportError:
33+
from ..testgres.nodeimportPgVer
34+
from ..testgres.nodeimportPostgresNode
35+
from ..testgres.utilsimportget_pg_version2
36+
from ..testgres.utilsimportfile_tail
37+
from ..testgres.utilsimportget_bin_path2
38+
from ..testgresimportProcessType
39+
from ..testgresimportNodeStatus
40+
from ..testgresimportIsolationLevel
41+
42+
# New name prevents to collect test-functions in TestgresException and fixes
43+
# the problem with pytest warning.
44+
from ..testgresimportTestgresExceptionastestgres_TestgresException
45+
46+
from ..testgresimportInitNodeException
47+
from ..testgresimportStartNodeException
48+
from ..testgresimportQueryException
49+
from ..testgresimportExecUtilException
50+
from ..testgresimportTimeoutException
51+
from ..testgresimportInvalidOperationException
52+
from ..testgresimportBackupException
53+
from ..testgresimportProgrammingError
54+
from ..testgresimportscoped_config
55+
from ..testgresimportFirst,Any
2956

3057
fromcontextlibimportcontextmanager
3158

‎tests/test_testgres_local.py‎

Lines changed: 34 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,40 @@
77
importplatform
88
importlogging
99

10-
from ..importtestgres
11-
12-
from ..testgresimportStartNodeException
13-
from ..testgresimportExecUtilException
14-
from ..testgresimportNodeApp
15-
from ..testgresimportscoped_config
16-
from ..testgresimportget_new_node
17-
from ..testgresimportget_bin_path
18-
from ..testgresimportget_pg_config
19-
from ..testgresimportget_pg_version
20-
21-
# NOTE: those are ugly imports
22-
from ..testgres.utilsimportbound_ports
23-
from ..testgres.utilsimportPgVer
24-
from ..testgres.nodeimportProcessProxy
10+
11+
try:
12+
# Python 3.8
13+
importtestgres
14+
15+
fromtestgresimportStartNodeException
16+
fromtestgresimportExecUtilException
17+
fromtestgresimportNodeApp
18+
fromtestgresimportscoped_config
19+
fromtestgresimportget_new_node
20+
fromtestgresimportget_bin_path
21+
fromtestgresimportget_pg_config
22+
fromtestgresimportget_pg_version
23+
24+
# NOTE: those are ugly imports
25+
fromtestgres.utilsimportbound_ports
26+
fromtestgres.utilsimportPgVer
27+
fromtestgres.nodeimportProcessProxy
28+
exceptImportError:
29+
from ..importtestgres
30+
31+
from ..testgresimportStartNodeException
32+
from ..testgresimportExecUtilException
33+
from ..testgresimportNodeApp
34+
from ..testgresimportscoped_config
35+
from ..testgresimportget_new_node
36+
from ..testgresimportget_bin_path
37+
from ..testgresimportget_pg_config
38+
from ..testgresimportget_pg_version
39+
40+
# NOTE: those are ugly imports
41+
from ..testgres.utilsimportbound_ports
42+
from ..testgres.utilsimportPgVer
43+
from ..testgres.nodeimportProcessProxy
2544

2645

2746
defpg_version_ge(version):

‎tests/test_testgres_remote.py‎

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,29 @@
77
from .helpers.global_dataimportPostgresNodeService
88
from .helpers.global_dataimportPostgresNodeServices
99

10-
from ..importtestgres
10+
try:
11+
# Python 3.8
12+
importtestgres
1113

12-
from..testgres.exceptionsimportInitNodeException
13-
from..testgres.exceptionsimportExecUtilException
14+
fromtestgres.exceptionsimportInitNodeException
15+
fromtestgres.exceptionsimportExecUtilException
1416

15-
from..testgres.configimportscoped_config
16-
from..testgres.configimporttestgres_config
17+
fromtestgres.configimportscoped_config
18+
fromtestgres.configimporttestgres_config
1719

18-
from ..testgresimportget_bin_path
19-
from ..testgresimportget_pg_config
20+
fromtestgresimportget_bin_path
21+
fromtestgresimportget_pg_config
22+
exceptImportError:
23+
from ..importtestgres
24+
25+
from ..testgres.exceptionsimportInitNodeException
26+
from ..testgres.exceptionsimportExecUtilException
27+
28+
from ..testgres.configimportscoped_config
29+
from ..testgres.configimporttestgres_config
30+
31+
from ..testgresimportget_bin_path
32+
from ..testgresimportget_pg_config
2033

2134
# NOTE: those are ugly imports
2235

‎tests/test_utils.py‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,15 @@
22
from .helpers.global_dataimportOsOpsDescrs
33
from .helpers.global_dataimportOsOperations
44

5-
from ..testgres.utilsimportparse_pg_version
6-
from ..testgres.utilsimportget_pg_config2
7-
from ..testgresimportscoped_config
5+
try:
6+
# Python 3.8
7+
fromtestgres.utilsimportparse_pg_version
8+
fromtestgres.utilsimportget_pg_config2
9+
fromtestgresimportscoped_config
10+
exceptImportError:
11+
from ..testgres.utilsimportparse_pg_version
12+
from ..testgres.utilsimportget_pg_config2
13+
from ..testgresimportscoped_config
814

915
importpytest
1016
importtyping

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp