Kaydet (Commit) 6cea397a authored tarafından Justn Lavoie's avatar Justn Lavoie Kaydeden (comit) Markus Mohrhard

tdf#97361 Use join() for string concatenation

The PEP8 suggest to use join() instead of + operator for string concatenation.

Change-Id: I35325cc73845a450f5c8ce40b7594e6d57ad6f45
Reviewed-on: https://gerrit.libreoffice.org/32504Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMarkus Mohrhard <markus.mohrhard@googlemail.com>
üst 215cbfb4
...@@ -73,20 +73,17 @@ class LoadSaveTest(unittest.TestCase): ...@@ -73,20 +73,17 @@ class LoadSaveTest(unittest.TestCase):
filepath = os.path.abspath("FIXME") filepath = os.path.abspath("FIXME")
if os.name == "nt": if os.name == "nt":
source_file = "file:///" + filepath + "/" + quote(self.file_name) source_file = ''.join(("file:///", filepath, "/", quote(self.file_name)))
else: else:
source_file = "file://" + quote(filepath) + "/" + quote(self.file_name) source_file = ''.join(("file://", quote(filepath), "/", quote(self.file_name)))
self.xDoc = desktop.loadComponentFromURL(source_file, "_blank", 0, load_props) self.xDoc = desktop.loadComponentFromURL(source_file, "_blank", 0, load_props)
assert(self.xDoc) assert(self.xDoc)
if os.name == "nt": if os.name == "nt":
target_file = "file:///" + self.m_TargetDir + quote(self.m_SourceDir) + "/" + quote(self.file_name) target_file = ''.join(("file:///", self.m_TargetDir, quote(self.m_SourceDir), "/", quote(self.file_name)))
else: else:
target_file = "file://" + target_file = ''.join(("file://", quote(self.m_TargetDir), quote(self.m_SourceDir), "/", quote(self.fileName)))
quote(self.m_TargetDir) +
quote(self.m_SourceDir) +
"/" +
quote(self.fileName)
p1 = PropertyValue() p1 = PropertyValue()
PropValue = uno.Any("[]com.sun.star.beans.PropertyValue", (p1,)) PropValue = uno.Any("[]com.sun.star.beans.PropertyValue", (p1,))
...@@ -98,7 +95,8 @@ class LoadSaveTest(unittest.TestCase): ...@@ -98,7 +95,8 @@ class LoadSaveTest(unittest.TestCase):
def getDirAndFile(self, dir): def getDirAndFile(self, dir):
root2 = os.mkdir(dir) root2 = os.mkdir(dir)
root = open(dir + "/" + dir + ".odt", 'a') root_path = ''.join((dir, "/", dir, ".odt"))
root = open(root_path, 'a')
self.getDirAndFileNames(dir) self.getDirAndFileNames(dir)
return self.dirs, self.files return self.dirs, self.files
...@@ -129,5 +127,6 @@ class LoadSaveTest(unittest.TestCase): ...@@ -129,5 +127,6 @@ class LoadSaveTest(unittest.TestCase):
f = os.mkdir(target + dir) f = os.mkdir(target + dir)
self.assertTrue(os.path.exists(target + dir)) self.assertTrue(os.path.exists(target + dir))
root = open(target + dir + "/" + self.m_SourceDir + ".odt", 'a') target_path = ''.join((target, dir, "/", self.m_SourceDir, ".odt"))
filepath = os.path.abspath(target + dir + "/" + self.m_SourceDir + ".odt") root = open(target_path, 'a')
filepath = os.path.abspath(target_path)
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