Fixes due to updated path library

Author: Ayuto

addons/source-python/packages/source-python/autodoc.py

@@ -77,14 +77,14 @@ def project_exists(self):
 
         :rtype: bool
         """
-        return self.project_dir.isdir()
+        return self.project_dir.is_dir()
 
     def package_exists(self):
         """Return True if the package exists.
 
         :rtype: bool
         """
-        return self.package_dir.isdir()
+        return self.package_dir.is_dir()
 
     def create(self, author, project_name=None, version='1'):
         """Create a new Sphinx project.
@@ -117,7 +117,7 @@ def create(self, author, project_name=None, version='1'):
         ]
 
         if project_name is None:
-            project_name = self.package_dir.namebase
+            project_name = self.package_dir.name
 
         argv.append('-p {0}'.format(project_name))
         argv.append('-a {0}'.format(author))

addons/source-python/packages/source-python/config/manager.py

@@ -259,7 +259,7 @@ def write(self):
             self._indention = 3
 
         # Do all directories to the file exist?
-        if not self.fullpath.parent.isdir():
+        if not self.fullpath.parent.is_dir():
 
             # Create the directories
             self.fullpath.parent.makedirs()
@@ -325,7 +325,7 @@ def write(self):
     def execute(self):
         """Execute the config file."""
         # Does the file exist?
-        if not self.fullpath.isfile():
+        if not self.fullpath.is_file():
             raise FileNotFoundError(
                 'Cannot execute file "{0}", file not found'.format(
                     self.fullpath))
@@ -381,7 +381,7 @@ def _parse_old_file(self):
         _old_config = defaultdict(list)
 
         # Does the file exist?
-        if not self.fullpath.isfile():
+        if not self.fullpath.is_file():
 
             # If not, simply return the empty dictionary
             return _old_config

addons/source-python/packages/source-python/core/__init__.py

@@ -90,7 +90,7 @@
 # >> GLOBAL VARIABLES
 # =============================================================================
 # Get the specific game for the server
-GAME_NAME = GAME_PATH.namebase
+GAME_NAME = GAME_PATH.name
 
 # Get the platform the server is on
 PLATFORM = system().lower()
@@ -238,11 +238,11 @@ def __init__(
             argument lists.
         """
         # If the given path doesn't exist, search for it in the cfg directory
-        if not path.isfile():
+        if not path.is_file():
             path = CFG_PATH.joinpath(path)
 
             # If no file was found, return an empty list
-            if not path.isfile():
+            if not path.is_file():
                 return
 
         # Import this here to fix cyclic imports

addons/source-python/packages/source-python/core/command/docs.py

@@ -195,7 +195,7 @@ def _prepare_generated_source_python_file(file_path):
     """
     new_name = file_path.parent / file_path.basename().replace(
         'source-python.', '')
-    if new_name.isfile():
+    if new_name.is_file():
         file_path.remove()
         return
 
@@ -445,13 +445,13 @@ def is_source_python(package):
 def is_custom_package(package):
     """Return True if the given package name is a custom package."""
     return package in map(
-        lambda path: str(path.namebase), CUSTOM_PACKAGES_PATH.listdir())
+        lambda path: str(path.name), CUSTOM_PACKAGES_PATH.listdir())
 
 
 def is_plugin(package):
     """Return True if the given package name is a plugin."""
     return package in map(
-        lambda path: str(path.namebase), PLUGIN_PATH.dirs())
+        lambda path: str(path.name), PLUGIN_PATH.dirs())
 
 
 # =============================================================================

addons/source-python/packages/source-python/core/update.py

@@ -168,7 +168,7 @@ def _clean_update_dir():
     """Clear or create the update directory."""
     if UPDATE_PATH.exists():
         for f in UPDATE_PATH.listdir():
-            if f.isfile():
+            if f.is_file():
                 f.remove()
             else:
                 f.rmtree()
@@ -200,12 +200,12 @@ def _apply_update_stage1():
         _apply_update_stage1_linux()
 
     # Apply latest data update
-    if not DATA_ZIP_FILE.isfile():
+    if not DATA_ZIP_FILE.is_file():
         return
 
     update_logger.log_debug('Applying latest data update...')
 
-    if UPDATE_SP_DATA_PATH.isdir():
+    if UPDATE_SP_DATA_PATH.is_dir():
         update_logger.log_debug(f'Removing {UPDATE_SP_DATA_PATH} ...')
         UPDATE_SP_DATA_PATH.rmtree()
 
@@ -221,7 +221,7 @@ def _apply_update_stage1_windows():
     to point to the new loader.
     If ``source-python.vdf`` does not exist, manual action is required.
     """
-    if not VDF_FILE.isfile():
+    if not VDF_FILE.is_file():
         update_logger.log_message(
             f'Stage 1 has been applied. Please shutdown your server and move '
             f'(do not copy) {LOADER_UPDATE_FILE} to {LOADER_FILE}. After that '
@@ -272,7 +272,7 @@ def update_data(timeout=DEFAULT_TIMEOUT):
         Number of seconds that need to pass until a timeout occurs.
     """
     _download_latest_data(timeout)
-    if SP_DATA_PATH.isdir():
+    if SP_DATA_PATH.is_dir():
         update_logger.log_debug('Removing {} ...'.format(SP_DATA_PATH))
         SP_DATA_PATH.rmtree()
 
@@ -285,7 +285,7 @@ def is_new_data_available(timeout=DEFAULT_TIMEOUT):
         Number of seconds that need to pass until a timeout occurs.
     :rtype: bool
     """
-    if not DATA_ZIP_FILE.isfile():
+    if not DATA_ZIP_FILE.is_file():
         return True
 
     return DATA_ZIP_FILE.read_hexhash('md5') != get_latest_data_checksum(timeout)

addons/source-python/packages/source-python/entities/entity.py

@@ -40,7 +40,7 @@
 # =============================================================================
 if SP_PACKAGES_PATH.joinpath(
     'entities', 'engines', SOURCE_ENGINE, GAME_NAME + '.py'
-).isfile():
+).is_file():
 
     # Import the game-specific 'Entity' class
     Entity = entities._base.Entity = import_module(
@@ -52,7 +52,7 @@
 
 elif SP_PACKAGES_PATH.joinpath(
     'entities', 'engines', SOURCE_ENGINE, '__init__.py'
-).isfile():
+).is_file():
 
     # Import the engine-specific 'Entity' class
     Entity = entities._base.Entity = import_module(

addons/source-python/packages/source-python/events/resource.py

@@ -81,7 +81,7 @@ def fullpath(self):
     def write(self):
         """Write the .res file to disk."""
         # Does the director for the .res file exist?
-        if not self.fullpath.parent.isdir():
+        if not self.fullpath.parent.is_dir():
 
             # Create the directory
             self.fullpath.parent.makedirs()

addons/source-python/packages/source-python/loggers.py

@@ -398,7 +398,7 @@ def __init__(
             log_path = LOG_PATH / filepath + '.log'
 
             # Does the parent directory exist?
-            if not log_path.parent.isdir():
+            if not log_path.parent.is_dir():
 
                 # Create the parent directory
                 log_path.parent.makedirs()

addons/source-python/packages/source-python/players/entity.py

@@ -31,7 +31,7 @@
 # =============================================================================
 if SP_PACKAGES_PATH.joinpath(
     'players', 'engines', SOURCE_ENGINE, GAME_NAME + '.py'
-).isfile():
+).is_file():
 
     # Import the game-specific 'Player' class
     Player = players._base.Player = import_module(
@@ -43,7 +43,7 @@
 
 elif SP_PACKAGES_PATH.joinpath(
     'players', 'engines', SOURCE_ENGINE, '__init__.py'
-).isfile():
+).is_file():
 
     # Import the engine-specific 'Player' class
     Player = players._base.Player = import_module(

addons/source-python/packages/source-python/plugins/manager.py

@@ -131,7 +131,7 @@ def plugins(self):
         :rtype: generator
         """
         for path in self.plugins_directory.dirs():
-            plugin_name = path.namebase
+            plugin_name = path.name
             if not self.is_valid_plugin_name(plugin_name):
                 continue
 
@@ -176,7 +176,7 @@ def load(self, plugin_name):
                 '"{}" is an invalid plugin name.'.format(plugin_name))
 
         plugin = self._create_plugin_instance(plugin_name)
-        if not plugin.file_path.isfile():
+        if not plugin.file_path.is_file():
             raise PluginFileNotFoundError(
                 'File {} does not exist.'.format(plugin.file_path))
 
@@ -284,7 +284,7 @@ def plugin_exists(self, plugin_name):
             The plugin to check.
         :rtype: bool
         """
-        return self.get_plugin_file_path(plugin_name).isfile()
+        return self.get_plugin_file_path(plugin_name).is_file()
 
     def get_plugin_instance(self, plugin_name):
         """Return a plugin's instance, if it is loaded.
@@ -357,7 +357,7 @@ def _create_plugin_info(self, plugin_name):
                 'Plugin "{}" does not exist.'.format(plugin_name))
 
         info_file = self.get_plugin_directory(plugin_name) / 'info.ini'
-        if not info_file.isfile():
+        if not info_file.is_file():
             # Just return an "empty" PluginInfo instance. We don't have more
             # information.
             return PluginInfo(plugin_name)

addons/source-python/packages/source-python/settings/storage.py

@@ -23,7 +23,7 @@
 _STORAGE_PATH = SP_DATA_PATH / 'settings' / 'users.db'
 
 # Does the ../data/source-python/settings/ directory exist?
-if not _STORAGE_PATH.parent.isdir():
+if not _STORAGE_PATH.parent.is_dir():
 
     # Create the ../data/source-python/settings/ directory
     _STORAGE_PATH.parent.mkdir()

addons/source-python/packages/source-python/translations/strings.py

@@ -61,21 +61,21 @@ def __init__(self, infile, encoding='utf_8'):
         self._encoding = encoding
 
         # Does the file exist?
-        if not self._mainfile.isfile():
+        if not self._mainfile.is_file():
 
             # Raise an error
             raise FileNotFoundError(
                 'No file found at {0}'.format(self._mainfile))
 
         # Get the path to the server specific file
         self._serverfile = self._mainfile.parent / '{0}_server.ini'.format(
-            self._mainfile.namebase)
+            self._mainfile.name)
 
         # Get the strings from the main file
         main_strings = GameConfigObj(self._mainfile, encoding=encoding)
 
         # Does the server specific file exist?
-        if not self._serverfile.isfile() and not infile.startswith('_core/'):
+        if not self._serverfile.is_file() and not infile.startswith('_core/'):
 
             # Create the server specific file
             self._create_server_file()

addons/source-python/packages/source-python/weapons/entity.py

@@ -31,7 +31,7 @@
 # =============================================================================
 if SP_PACKAGES_PATH.joinpath(
     'weapons', 'engines', SOURCE_ENGINE, GAME_NAME + '.py'
-).isfile():
+).is_file():
 
     # Import the game-specific 'Weapon' class
     Weapon = weapons._base.Weapon = import_module(
@@ -43,7 +43,7 @@
 
 elif SP_PACKAGES_PATH.joinpath(
     'weapons', 'engines', SOURCE_ENGINE, '__init__.py'
-).isfile():
+).is_file():
 
     # Import the engine-specific 'Weapon' class
     Weapon = weapons._base.Weapon = import_module(

addons/source-python/packages/source-python/weapons/manager.py

@@ -168,7 +168,7 @@ def tags(self):
         return self._tags
 
 # Does the current game have an ini file?
-if _gamepath.isfile():
+if _gamepath.is_file():
 
     # Get the _WeaponManager instance
     weapon_manager = _WeaponManager()