57 lines
2.0 KiB
Diff
57 lines
2.0 KiB
Diff
--- ruamel-yaml-code-af9628b0d0479c35a60efc44b8d6dff9dc95aed2/_doc/conf.py.orig 2021-04-20 17:11:58.090894727 -0600
|
|
+++ ruamel-yaml-code-af9628b0d0479c35a60efc44b8d6dff9dc95aed2/_doc/conf.py 2021-04-20 17:13:38.946521358 -0600
|
|
@@ -75,7 +75,10 @@ class ryd2rst:
|
|
if False:
|
|
try:
|
|
from ryd.__main__ import RYDCmd
|
|
- from ruamel.std.pathlib import Path
|
|
+ try:
|
|
+ from pathlib import Path
|
|
+ except ImportError:
|
|
+ from pathlib2 import Path
|
|
|
|
oldargv = sys.argv
|
|
for fn in Path('.').glob('*.ryd'):
|
|
--- ruamel-yaml-code-af9628b0d0479c35a60efc44b8d6dff9dc95aed2/_test/test_api_change.py.orig 2021-04-20 17:12:13.434990060 -0600
|
|
+++ ruamel-yaml-code-af9628b0d0479c35a60efc44b8d6dff9dc95aed2/_test/test_api_change.py 2021-04-20 17:13:58.317641717 -0600
|
|
@@ -9,7 +9,10 @@ testing of anchors and the aliases refer
|
|
import sys
|
|
import textwrap
|
|
import pytest
|
|
-from ruamel.std.pathlib import Path
|
|
+try:
|
|
+ from pathlib import Path
|
|
+except ImportError:
|
|
+ from pathlib2 import Path
|
|
|
|
|
|
class TestNewAPI:
|
|
--- ruamel-yaml-code-af9628b0d0479c35a60efc44b8d6dff9dc95aed2/_test/roundtrip.py.orig 2021-04-20 17:25:36.621971457 -0600
|
|
+++ ruamel-yaml-code-af9628b0d0479c35a60efc44b8d6dff9dc95aed2/_test/roundtrip.py 2021-04-20 17:26:47.303408002 -0600
|
|
@@ -7,7 +7,10 @@ helper routines for testing round trip o
|
|
"""
|
|
import sys
|
|
import textwrap
|
|
-from ruamel.std.pathlib import Path
|
|
+try:
|
|
+ from pathlib import Path
|
|
+except ImportError:
|
|
+ from pathlib2 import Path
|
|
|
|
enforce = object()
|
|
|
|
--- ruamel-yaml-code-af9628b0d0479c35a60efc44b8d6dff9dc95aed2/_test/test_z_data.py.orig 2021-04-20 17:26:30.851306390 -0600
|
|
+++ ruamel-yaml-code-af9628b0d0479c35a60efc44b8d6dff9dc95aed2/_test/test_z_data.py 2021-04-20 17:26:40.850368147 -0600
|
|
@@ -6,7 +6,10 @@ import sys
|
|
import pytest # NOQA
|
|
import warnings # NOQA
|
|
|
|
-from ruamel.std.pathlib import Path
|
|
+try:
|
|
+ from pathlib import Path
|
|
+except ImportError:
|
|
+ from pathlib2 import Path
|
|
|
|
base_path = Path('data') # that is ruamel.yaml.data
|
|
PY2 = sys.version_info[0] == 2
|