From 93876f418b25b620cc51fb5de28f2bdb0b61085642959b6fb971f30f33d91d74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= <mimi.vx@gmail.com>
Date: Sat, 28 Dec 2019 18:09:35 +0000
Subject: [PATCH] - add fix_pathlib.patch

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:pytest/python-pytest-shutil?expand=0&rev=8
---
 fix_pathlib.patch            | 50 ++++++++++++++++++++++++++++++++++++
 python-pytest-shutil.changes |  1 +
 python-pytest-shutil.spec    |  4 +--
 3 files changed, 53 insertions(+), 2 deletions(-)
 create mode 100644 fix_pathlib.patch

diff --git a/fix_pathlib.patch b/fix_pathlib.patch
new file mode 100644
index 0000000..6bb99ca
--- /dev/null
+++ b/fix_pathlib.patch
@@ -0,0 +1,50 @@
+Index: pytest-shutil-1.7.0/pytest_shutil/workspace.py
+===================================================================
+--- pytest-shutil-1.7.0.orig/pytest_shutil/workspace.py
++++ pytest-shutil-1.7.0/pytest_shutil/workspace.py
+@@ -8,9 +8,14 @@ import logging
+ import subprocess
+ 
+ try:
+-    from path import Path
++    from pathlib import Path
++    Path.isdir = Path.is_dir
++    Path.makedirs = Path.mkdir
+ except ImportError:
+-    from path import path as Path
++    try:
++        from path import Path
++    except ImportError:
++        from path import path as Path
+ 
+ import pytest
+ from six import string_types
+Index: pytest-shutil-1.7.0/setup.py
+===================================================================
+--- pytest-shutil-1.7.0.orig/setup.py
++++ pytest-shutil-1.7.0/setup.py
+@@ -24,9 +24,9 @@ classifiers = [
+ 
+ install_requires = ['six',
+                     'execnet',
+-                    'contextlib2',
++                    'contextlib2;python_version<"3"',
+                     'pytest',
+-                    'path.py',
++                    'path.py;python_version<"3"',
+                     'mock',
+                     'termcolor'
+                     ]
+Index: pytest-shutil-1.7.0/tests/integration/test_run_integration.py
+===================================================================
+--- pytest-shutil-1.7.0.orig/tests/integration/test_run_integration.py
++++ pytest-shutil-1.7.0/tests/integration/test_run_integration.py
+@@ -192,7 +192,7 @@ def test_run_in_subprocess_uses_passed_p
+ def test_run_in_subprocess_cd():
+     with workspace.Workspace() as ws:
+         with no_cov():
+-            cwd = run.run_in_subprocess(os.getcwd, cd=ws.workspace)()
++            cwd = run.run_in_subprocess(os.getcwd, cd=str(ws.workspace))()
+     assert os.path.realpath(cwd) == os.path.realpath(ws.workspace)
+ 
+ 
diff --git a/python-pytest-shutil.changes b/python-pytest-shutil.changes
index 43257eb..06108ee 100644
--- a/python-pytest-shutil.changes
+++ b/python-pytest-shutil.changes
@@ -2,6 +2,7 @@
 Sat Dec 28 17:36:29 UTC 2019 - Ondřej Súkup <mimi.vx@gmail.com>
 
 - fix dependency on python-path.py
+- add fix_pathlib.patch
 
 -------------------------------------------------------------------
 Mon Jun  3 09:07:17 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
diff --git a/python-pytest-shutil.spec b/python-pytest-shutil.spec
index a634875..bb0e3b6 100644
--- a/python-pytest-shutil.spec
+++ b/python-pytest-shutil.spec
@@ -25,6 +25,7 @@ License:        MIT
 Group:          Development/Languages/Python
 URL:            https://github.com/manahl/pytest-plugins
 Source:         https://files.pythonhosted.org/packages/source/p/pytest-shutil/pytest-shutil-%{version}.tar.gz
+Patch0:         fix_pathlib.patch
 BuildRequires:  %{python_module execnet}
 BuildRequires:  %{python_module mock}
 BuildRequires:  %{python_module path.py}
@@ -55,8 +56,7 @@ tools for automated tests.
 
 %prep
 %setup -q -n pytest-shutil-%{version}
-sed -i 's/contextlib2/contextlib2;python_version<"3"/' setup.py
-sed -i 's/path\.py/path\.py;python_version<"3"/' setup.py
+%patch0 -p1
 
 %build
 %python_build