Use os.path: basename() and dirname() instead of split()

According to Python documentation[1] dirname and basename
are defined as follows:
    os.path.dirname() = os.path.split()[0]
    os.path.basename() = os.path.split()[1]
For the purpose of better readability split() is replaced
by appropriate function if only one part of returned tuple
is used.

[1]: https://docs.python.org/3/library/os.path.html#os.path.split

4 files changed, 11 insertions, 11 deletions

diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py
index 5a5db22..292b027 100644
--- a/mesonbuild/backend/backends.py
+++ b/mesonbuild/backend/backends.py
@@ -322,7 +322,7 @@ class Backend:
                         continue
                     if os.path.splitext(libpath)[1] not in ['.dll', '.lib', '.so']:
                         continue
-                    absdir = os.path.split(libpath)[0]
+                    absdir = os.path.dirname(libpath)
                     rel_to_src = absdir[len(self.environment.get_source_dir()) + 1:]
                     assert(not os.path.isabs(rel_to_src))
                     paths.append(os.path.join(self.build_to_src, rel_to_src))
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py
index 77c7d50..9318926 100644
--- a/mesonbuild/backend/ninjabackend.py
+++ b/mesonbuild/backend/ninjabackend.py
@@ -823,7 +823,7 @@ int dummy;
                 if subdir is None:
                     subdir = os.path.join(manroot, 'man' + num)
                 srcabs = f.absolute_path(self.environment.get_source_dir(), self.environment.get_build_dir())
-                dstabs = os.path.join(subdir, os.path.split(f.fname)[1] + '.gz')
+                dstabs = os.path.join(subdir, os.path.basename(f.fname) + '.gz')
                 i = [srcabs, dstabs]
                 d.man.append(i)
 
@@ -836,7 +836,7 @@ int dummy;
             subdir = de.install_dir
             for f in de.sources:
                 assert(isinstance(f, mesonlib.File))
-                plain_f = os.path.split(f.fname)[1]
+                plain_f = os.path.basename(f.fname)
                 dstabs = os.path.join(subdir, plain_f)
                 i = [f.absolute_path(srcdir, builddir), dstabs, de.install_mode]
                 d.data.append(i)
@@ -1278,7 +1278,7 @@ int dummy;
                 # Target names really should not have slashes in them, but
                 # unfortunately we did not check for that and some downstream projects
                 # now have them. Once slashes are forbidden, remove this bit.
-                target_slashname_workaround_dir = os.path.join(os.path.split(target.name)[0],
+                target_slashname_workaround_dir = os.path.join(os.path.dirname(target.name),
                                                                self.get_target_dir(target))
             else:
                 target_slashname_workaround_dir = self.get_target_dir(target)
@@ -1401,7 +1401,7 @@ int dummy;
         objects = [] # Relative to swift invocation dir
         rel_objects = [] # Relative to build.ninja
         for i in abssrc + abs_generated:
-            base = os.path.split(i)[1]
+            base = os.path.basename(i)
             oname = os.path.splitext(base)[0] + '.o'
             objects.append(oname)
             rel_objects.append(os.path.join(self.get_target_private_dir(target), oname))
@@ -1928,7 +1928,7 @@ rule FORTRAN_DEP_HACK
                     # Check if a source uses a module it exports itself.
                     # Potential bug if multiple targets have a file with
                     # the same name.
-                    if mod_source_file.fname == os.path.split(src)[1]:
+                    if mod_source_file.fname == os.path.basename(src):
                         continue
                     mod_name = compiler.module_name_to_filename(
                         usematch.group(1))
@@ -2271,7 +2271,7 @@ rule FORTRAN_DEP_HACK
 
         commands = []
         commands += self.generate_basic_compiler_args(target, compiler)
-        just_name = os.path.split(header)[1]
+        just_name = os.path.basename(header)
         (objname, pch_args) = compiler.gen_pch_args(just_name, source, dst)
         commands += pch_args
         commands += self.get_compile_debugfile_args(compiler, target, objname)
@@ -2281,7 +2281,7 @@ rule FORTRAN_DEP_HACK
     def generate_gcc_pch_command(self, target, compiler, pch):
         commands = self._generate_single_compile(target, compiler)
         dst = os.path.join(self.get_target_private_dir(target),
-                           os.path.split(pch)[-1] + '.' + compiler.get_pch_suffix())
+                           os.path.basename(pch) + '.' + compiler.get_pch_suffix())
         dep = dst + '.' + compiler.get_depfile_suffix()
         return commands, dep, dst, []  # Gcc does not create an object file during pch generation.
 
@@ -2476,7 +2476,7 @@ rule FORTRAN_DEP_HACK
             # unfortunately we did not check for that and some downstream projects
             # now have them. Once slashes are forbidden, remove this bit.
             target_slashname_workaround_dir = os.path.join(
-                os.path.split(target.name)[0],
+                os.path.dirname(target.name),
                 self.get_target_dir(target))
         else:
             target_slashname_workaround_dir = self.get_target_dir(target)
diff --git a/mesonbuild/backend/vs2010backend.py b/mesonbuild/backend/vs2010backend.py
index 1722db7..057e7c9 100644
--- a/mesonbuild/backend/vs2010backend.py
+++ b/mesonbuild/backend/vs2010backend.py
@@ -1034,7 +1034,7 @@ class Vs2010Backend(backends.Backend):
                     pch_file = ET.SubElement(inc_cl, 'PrecompiledHeaderFile')
                     # MSBuild searches for the header relative from the implementation, so we have to use
                     # just the file name instead of the relative path to the file.
-                    pch_file.text = os.path.split(header)[1]
+                    pch_file.text = os.path.basename(header)
                     self.add_additional_options(lang, inc_cl, file_args)
                     self.add_preprocessor_defines(lang, inc_cl, file_defines)
                     self.add_include_dirs(lang, inc_cl, file_inc_dirs)
diff --git a/mesonbuild/backend/xcodebackend.py b/mesonbuild/backend/xcodebackend.py
index aca3aea..3ae31e4 100644
--- a/mesonbuild/backend/xcodebackend.py
+++ b/mesonbuild/backend/xcodebackend.py
@@ -311,7 +311,7 @@ class XCodeBackend(backends.Backend):
         for fname, idval in self.filemap.items():
             fullpath = os.path.join(self.environment.get_source_dir(), fname)
             xcodetype = self.get_xcodetype(fname)
-            name = os.path.split(fname)[-1]
+            name = os.path.basename(fname)
             path = fname
             self.ofile.write(src_templ % (idval, fullpath, xcodetype, name, path))
         target_templ = '%s /* %s */ = { isa = PBXFileReference; explicitFileType = "%s"; path = %s; refType = %d; sourceTree = BUILT_PRODUCTS_DIR; };\n'