pathlib is only in python 3.4+

We still use 3.3 on windows.

Change-Id: I32adabe1eb12d8803d61458fcb1a228b3ff045e0

3 files changed, 36 insertions, 13 deletions

diff --git a/uitest/calc_tests/tdf96453.py b/uitest/calc_tests/tdf96453.py
index 020b901c3f6c..fb8e40454d3e 100644
--- a/uitest/calc_tests/tdf96453.py
+++ b/uitest/calc_tests/tdf96453.py
@@ -11,16 +11,13 @@ import os
 import pathlib
 
 from uitest.uihelper.common import get_state_as_dict
+from uitest.path import get_srcdir_url
+
 from libreoffice.calc.document import get_sheet_from_doc
 from libreoffice.calc.conditional_format import get_conditional_format_from_sheet
 
-def get_data_dir():
-    current_dir = os.path.dirname(os.path.realpath(__file__))
-    return os.path.join(current_dir, "data")
-
 def get_url_for_data_file(file_name):
-    path = os.path.join(get_data_dir(), file_name)
-    return pathlib.Path(path).as_uri()
+    return get_srcdir_url() + "/uitest/calc_tests/data/" + file_name
 
 class ConditionalFormatDlgTest(UITestCase):
 
diff --git a/uitest/demo_ui/handle_multiple_files.py b/uitest/demo_ui/handle_multiple_files.py
index ab56c5533d91..dd4cba7966dd 100644
--- a/uitest/demo_ui/handle_multiple_files.py
+++ b/uitest/demo_ui/handle_multiple_files.py
@@ -11,18 +11,13 @@ from libreoffice.uno.eventlistener import EventListener
 from uitest.framework import UITestCase
 
 from uitest.debug import sleep
+from uitest.path import get_srcdir_url
 
 import time
 import os
-import pathlib
-
-def get_data_dir():
-    current_dir = os.path.dirname(os.path.realpath(__file__))
-    return os.path.join(current_dir, "data")
 
 def get_url_for_data_file(file_name):
-    path = os.path.join(get_data_dir(), file_name)
-    return pathlib.Path(path).as_uri()
+    return get_srcdir_url() + "/uitest/demo_ui/data/" + file_name
 
 class HandleFiles(UITestCase):
 
diff --git a/uitest/uitest/path.py b/uitest/uitest/path.py
new file mode 100644
index 000000000000..19eea2aed2c9
--- /dev/null
+++ b/uitest/uitest/path.py
@@ -0,0 +1,31 @@
+# -*- Mode: python; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+import os
+from urllib.parse import urljoin
+from urllib.request import pathname2url
+
+def get_src_dir_fallback():
+    current_dir = os.path.dirname(os.path.realpath(__file__))
+    return os.path.abspath(os.path.join(current_dir, "../../"))
+
+def path2url(path):
+        return urljoin('file:', pathname2url(path))
+
+def get_workdir_url():
+    workdir_path = os.environ.get('WORKDIR', os.path.join(get_src_dir_fallback(), 'workdir'))
+    return path2url(workdir_path)
+
+def get_srcdir_url():
+    srcdir_path = os.environ.get('SRCDIR', get_src_dir_fallback())
+    return path2url(srcdir_path)
+
+def get_instdir_url():
+    instdir_path = os.environ.get('INSTDIR', os.path.join(get_src_dir_fallback(), 'instdir'))
+    return path2url(instdir_path)
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab: */