django-dbbackup 5.2.0__tar.gz → 5.3.1__tar.gz

{django_dbbackup-5.2.0 → django_dbbackup-5.3.1}/PKG-INFO

@@ -1,8 +1,8 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: django-dbbackup
-Version: 5.2.0
+Version: 5.3.1
 Summary: Management commands to help backup and restore a project database and media.
-Project-URL: Changelog, https://archmonger.github.io/django-dbbackup /latest/changelog/
+Project-URL: Changelog, https://archmonger.github.io/django-dbbackup/latest/changelog/
 Project-URL: Documentation, https://archmonger.github.io/django-dbbackup
 Project-URL: Source, https://github.com/Archmonger/django-dbbackup
 Author-email: Mark Bakhit <archiethemonger@gmail.com>
@@ -12,27 +12,27 @@ Keywords: amazon,backup,database,django,dropbox,media,s3,sqlite
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
 Classifier: Environment :: Web Environment
-Classifier: Framework :: Django :: 4.2
 Classifier: Framework :: Django :: 5.0
 Classifier: Framework :: Django :: 5.1
 Classifier: Framework :: Django :: 5.2
+Classifier: Framework :: Django :: 6.0
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: System Administrators
 Classifier: License :: OSI Approved :: BSD License
 Classifier: Natural Language :: English
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Database
 Classifier: Topic :: System :: Archiving
 Classifier: Topic :: System :: Archiving :: Backup
 Classifier: Topic :: System :: Archiving :: Compression
-Requires-Python: >=3.9
-Requires-Dist: django>=4.2
+Requires-Python: >=3.10
+Requires-Dist: django>=5.0
 Description-Content-Type: text/markdown
 
 <!--docs-top-start-->

{django_dbbackup-5.2.0 → django_dbbackup-5.3.1}/dbbackup/__init__.py

@@ -1,3 +1,3 @@
 """Management commands to help backup and restore a project database and media"""
 
-__version__ = "5.2.0"
+__version__ = "5.3.1"

{django_dbbackup-5.2.0 → django_dbbackup-5.3.1}/dbbackup/db/django.py

@@ -6,6 +6,7 @@ for database-agnostic backup and restore operations. It works with
 any Django-supported database backend.
 """
 
+import codecs
 import contextlib
 import os
 import tempfile
@@ -35,8 +36,11 @@ class DjangoConnector(BaseDBConnector):
         Returns a file-like object containing the serialized database data
         in JSON format.
         """
-        # Create a SpooledTemporaryFile in text mode for direct use with dumpdata
-        dump_file = SpooledTemporaryFile(mode="w+t", encoding="utf-8")
+
+        binary_dump_file = SpooledTemporaryFile(mode="w+b")
+
+        # Wrap Binary SpooledTemporaryFile in text mode for direct use with dumpdata
+        dump_file = codecs.getwriter("utf-8")(binary_dump_file)
 
         # Prepare arguments for dumpdata command
         dump_args = []
@@ -108,8 +112,8 @@ class DjangoConnector(BaseDBConnector):
         call_command("dumpdata", *dump_args, **dump_kwargs)
 
         # Reset file position to beginning for reading
-        dump_file.seek(0)
-        return dump_file
+        binary_dump_file.seek(0)
+        return binary_dump_file
 
     def _restore_dump(self, dump):
         """

{django_dbbackup-5.2.0 → django_dbbackup-5.3.1}/dbbackup/db/postgresql.py

@@ -10,6 +10,13 @@ from dbbackup.db.base import BaseCommandDBConnector
 logger = logging.getLogger("dbbackup.command")
 
 
+def _host_requires_uri_quoting(host: str) -> bool:
+    # Match *nix paths (e.g. /run/postgres) and Windows paths (e.g. C:\path\to\socket)
+    return host.startswith(("/", "@")) or (
+        len(host) >= 3 and host[0].isalpha() and host[1] == ":" and host[2] in ("/", "\\")
+    )
+
+
 def parse_postgres_settings(connector: PgDumpBinaryConnector | PgDumpConnector) -> tuple[str, dict[Any, Any]]:
     """
     Parse the common Postgres connectors settings and
@@ -22,7 +29,11 @@ def parse_postgres_settings(connector: PgDumpBinaryConnector | PgDumpConnector)
     Returns:
         tuple: (cmd_part, environment_dict)
     """
-    host = connector.settings.get("HOST", "localhost")
+    host = connector.settings.get("HOST")
+    if host is None:
+        host = "localhost"
+    elif _host_requires_uri_quoting(host):
+        host = quote(host, safe="")
     cmd_part = connector.settings.get("NAME", "")
     user = quote(connector.settings.get("USER") or "")
     password = connector.settings.get("PASSWORD", -1)

{django_dbbackup-5.2.0 → django_dbbackup-5.3.1}/dbbackup/management/commands/_base.py

@@ -85,6 +85,19 @@ class BaseDbBackupCommand(BaseCommand):
         level = 60 if self.quiet else LOGGING_VERBOSITY[int(self.verbosity)]
         self.logger.setLevel(level)
 
+        # Find or create a StreamHandler for console output so that
+        # --verbosity works regardless of the user's Django LOGGING
+        # configuration. Only add one handler to avoid duplicates.
+        for handler in self.logger.handlers:
+            if isinstance(handler, logging.StreamHandler):
+                handler.setLevel(level)
+                break
+        else:
+            handler = logging.StreamHandler(sys.stderr)
+            handler.setLevel(level)
+            handler.setFormatter(logging.Formatter("%(levelname)s %(message)s"))
+            self.logger.addHandler(handler)
+
     def _ask_confirmation(self):
         answer = input("Are you sure you want to continue? [Y/n] ")
         if answer.lower().startswith("n"):

{django_dbbackup-5.2.0 → django_dbbackup-5.3.1}/dbbackup/storage.py

@@ -76,7 +76,7 @@ class Storage:
         self.storage.delete(name=filepath)
 
     def list_directory(self, path=""):
-        return self.storage.listdir(path)[1]
+        return [self._normalize_listed_name(name) for name in self.storage.listdir(path)[1]]
 
     def write_file(self, filehandle, filename):
         self.logger.debug("Writing file %s", filename)
@@ -295,6 +295,18 @@ class Storage:
             return file_date.replace(tzinfo=timezone.utc)
         return file_date
 
+    def _normalize_listed_name(self, name: str) -> str:
+        location = getattr(self.storage, "location", "") or ""
+        if not location:
+            return name
+
+        normalized_location = location.replace("\\", "/").strip("/")
+        normalized_name = name.replace("\\", "/")
+        prefix = f"{normalized_location}/"
+        if normalized_location and normalized_name.startswith(prefix):
+            return normalized_name[len(prefix) :]
+        return name
+
 
 def get_storage_class(path=None):
     """

{django_dbbackup-5.2.0 → django_dbbackup-5.3.1}/pyproject.toml

@@ -18,34 +18,34 @@ keywords = [
 ]
 license = "BSD-3-Clause"
 authors = [{ name = "Mark Bakhit", email = "archiethemonger@gmail.com" }]
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 classifiers = [
   "Development Status :: 5 - Production/Stable",
   "Environment :: Web Environment",
   "Environment :: Console",
-  "Framework :: Django :: 4.2",
   "Framework :: Django :: 5.0",
   "Framework :: Django :: 5.1",
   "Framework :: Django :: 5.2",
+  "Framework :: Django :: 6.0",
   "Intended Audience :: Developers",
   "Intended Audience :: System Administrators",
   "License :: OSI Approved :: BSD License",
   "Natural Language :: English",
   "Operating System :: OS Independent",
   "Programming Language :: Python",
-  "Programming Language :: Python :: 3.9",
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
   "Programming Language :: Python :: 3.13",
+  "Programming Language :: Python :: 3.14",
   "Topic :: Database",
   "Topic :: System :: Archiving",
   "Topic :: System :: Archiving :: Backup",
   "Topic :: System :: Archiving :: Compression",
 ]
-dependencies = ["django>=4.2"]
+dependencies = ["django>=5.0"]
 dynamic = ["version"]
-urls.Changelog = "https://archmonger.github.io/django-dbbackup /latest/changelog/"
+urls.Changelog = "https://archmonger.github.io/django-dbbackup/latest/changelog/"
 urls.Documentation = "https://archmonger.github.io/django-dbbackup"
 urls.Source = "https://github.com/Archmonger/django-dbbackup"
 
@@ -80,11 +80,6 @@ matrix-name-format = "{variable}-{value}"
 [tool.hatch.envs.hatch-test.env-vars]
 DJANGO_SETTINGS_MODULE = "tests.settings"
 
-# Django 4.2
-[[tool.hatch.envs.hatch-test.matrix]]
-python = ["3.9", "3.10", "3.11", "3.12"]
-django = ["4.2"]
-
 # Django 5.0
 [[tool.hatch.envs.hatch-test.matrix]]
 python = ["3.10", "3.11", "3.12"]
@@ -100,11 +95,13 @@ django = ["5.1"]
 python = ["3.10", "3.11", "3.12", "3.13"]
 django = ["5.2"]
 
+# Django 6.0
+[[tool.hatch.envs.hatch-test.matrix]]
+python = ["3.12", "3.13", "3.14"]
+django = ["6.0"]
+
 [tool.hatch.envs.hatch-test.overrides]
 matrix.django.dependencies = [
-  { if = [
-    "4.2",
-  ], value = "django>=4.2,<4.3" },
   { if = [
     "5.0",
   ], value = "django>=5.0,<5.1" },
@@ -114,6 +111,9 @@ matrix.django.dependencies = [
   { if = [
     "5.2",
   ], value = "django>=5.2,<5.3" },
+  { if = [
+    "6.0",
+  ], value = "django>=6.0,<6.1" },
 ]
 
 # >>> Documentation Scripts <<<
@@ -133,6 +133,7 @@ dependencies = [
   "mkdocs-git-authors-plugin",
   "mkdocs-minify-plugin",
   "mike",
+  "click==8.2.1", # Newer versions of click do not work with mkdocs<2.0
 ]
 
 [tool.hatch.envs.docs.scripts]
@@ -191,7 +192,6 @@ postgres = ["python scripts/postgres_live_test.py {args}"]
 
 [tool.ruff]
 line-length = 120
-target-version = "py39"
 extend-exclude = [".eggs/*", ".tox/*", ".venv/*", "build/*", "*/migrations/*"]
 format.preview = true
 lint.extend-ignore = [