Kaydet (Commit) f6624944 authored tarafından Markus Mohrhard's avatar Markus Mohrhard

pathlib is only in python 3.4+

We still use 3.3 on windows.

Change-Id: I32adabe1eb12d8803d61458fcb1a228b3ff045e0
üst 0ab45be6
......@@ -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):
......
......@@ -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):
......
# -*- 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: */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment