address utcnow deprecation (#91)

Author: amol-

.github/workflows/run-tests.yml

@@ -10,7 +10,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2

README.rst

@@ -14,7 +14,7 @@ DEPOT - File Storage Made Easy
    :target: https://pypi.python.org/pypi/filedepot
 
 DEPOT is a framework for easily storing and serving files in
-web applications on Python2.6+ and Python3.2+.
+web applications on Python 3.9+.
 
 DEPOT supports storing files in multiple backends, like:
 

depot/_compat.py

@@ -1,4 +1,5 @@
 import platform, sys
+from datetime import datetime, timedelta, tzinfo
 
 
 if platform.system() == 'Windows':  # pragma: no cover
@@ -55,3 +56,25 @@ def percent_decode(string):
 def with_metaclass(meta, base=object):
     """Create a base class with a metaclass."""
     return meta("NewBase", (base,), {})
+
+
+class _UTC(tzinfo):
+    def utcoffset(self, dt):
+        return timedelta(0)
+
+    def tzname(self, dt):
+        return "UTC"
+
+    def dst(self, dt):
+        return timedelta(0)
+
+
+_UTC_TZINFO = _UTC()
+
+
+def utcnow_naive():
+    return datetime.now(_UTC_TZINFO).replace(tzinfo=None)
+
+
+def utcfromtimestamp_naive(ts):
+    return datetime.fromtimestamp(ts, _UTC_TZINFO).replace(tzinfo=None)

depot/io/local.py

@@ -8,6 +8,7 @@
 import uuid
 import shutil
 import json
+from io import BytesIO
 from datetime import datetime
 
 from .interfaces import FileStorage, StoredFile
@@ -52,10 +53,11 @@ def read(self, n=-1):
 
     def close(self):
         if self._file is None:
-            # This is to guarantee that closing a file
-            # before even reading it behaves correctly
-            self._file = open(self._file_path, 'rb')
-        self._file.close()
+            self._file = _ClosedLocalFile(self._file_path)
+            return
+
+        if not self._file.closed:
+            self._file.close()
 
     @property
     def closed(self):
@@ -64,6 +66,13 @@ def closed(self):
         return self._file.closed
 
 
+class _ClosedLocalFile(BytesIO):
+    def __init__(self, file_path):
+        super(_ClosedLocalFile, self).__init__(b'')
+        self.name = file_path
+        self.close()
+
+
 class LocalFileStorage(FileStorage):
     """:class:`depot.io.interfaces.FileStorage` implementation that stores files locally.
 

depot/io/utils.py

@@ -1,15 +1,14 @@
 import mimetypes
 import os
-from datetime import datetime
 from tempfile import SpooledTemporaryFile
-from depot._compat import byte_string
+from depot._compat import byte_string, utcnow_naive
 
 
 INMEMORY_FILESIZE = 1024*1024
 
 
 def timestamp():
-    return datetime.utcnow().strftime('%Y-%m-%d %H:%M:%S')
+    return utcnow_naive().strftime('%Y-%m-%d %H:%M:%S')
 
 
 def file_from_content(content):

depot/middleware.py

@@ -2,7 +2,7 @@
 from email.utils import parsedate_tz, mktime_tz
 from time import gmtime, time
 from .manager import DepotManager
-from ._compat import wsgi_string
+from ._compat import wsgi_string, utcfromtimestamp_naive
 from .utils import make_content_disposition
 
 _BLOCK_SIZE = 4096 * 64 # 256K
@@ -47,7 +47,7 @@ def generate_etag(self):
 
     def parse_date(self, value):
         try:
-            return datetime.utcfromtimestamp(mktime_tz(parsedate_tz(value)))
+            return utcfromtimestamp_naive(mktime_tz(parsedate_tz(value)))
         except (TypeError, OverflowError):
             raise RuntimeError("Received an ill-formed timestamp")
 

setup.py

@@ -43,7 +43,12 @@
         "Environment :: Web Environment",
         "Topic :: Software Development :: Libraries :: Python Modules",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 2"
+        "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"
         ],
       keywords='storage files s3 gridfs mongodb aws sqlalchemy wsgi',
       author='Alessandro Molina',
@@ -52,6 +57,7 @@
       license='MIT',
       packages=find_packages(exclude=['ez_setup', 'tests']),
       include_package_data=True,
+      python_requires='>=3.9',
       install_requires=INSTALL_DEPENDENCIES,
       tests_require=TEST_DEPENDENCIES,
       extras_require={

tests/base_sqla.py

@@ -1,7 +1,7 @@
-from datetime import datetime
 from sqlalchemy import *
 from sqlalchemy.orm import scoped_session, sessionmaker, relationship
 from sqlalchemy.orm import declarative_base
+from depot._compat import utcnow_naive
 
 maker = sessionmaker(autoflush=True, autocommit=False)
 DBSession = scoped_session(maker)
@@ -42,7 +42,7 @@ class ThingWithDate(DeclarativeBase):
 
     uid = Column(Integer, autoincrement=True, primary_key=True)
     name = Column(Unicode(16), unique=True)
-    updated_at = Column(DateTime, default=datetime.utcnow)
+    updated_at = Column(DateTime, default=utcnow_naive)
 
     related_thing_id = Column(Integer, ForeignKey('thing.uid'))
     related_thing = relationship(Thing)

tests/test_fields_basic.py

@@ -2,14 +2,16 @@
 import shutil
 import tempfile, os, base64
 import unittest
+import datetime
 from sqlalchemy.schema import Column
 from sqlalchemy.types import Unicode, Integer
-from .base_sqla import setup_database, clear_database, DeclarativeBase, DBSession
+from .base_sqla import setup_database, clear_database, DeclarativeBase, DBSession, ThingWithDate
 from .utils import OpenFiles
 from depot.fields.sqlalchemy import UploadedFileField
 from depot.fields.upload import UploadedFile
 from depot.manager import DepotManager
 from depot.fields.interfaces import FileFilter
+from depot.io import utils as io_utils
 
 from depot._compat import u_, bytes_
 
@@ -134,3 +136,16 @@ def test_storage_does_not_exists(self):
         DBSession.add(doc)
         DBSession.flush()
         DBSession.commit()
+
+    def test_thing_with_date_default_is_naive(self):
+        doc = ThingWithDate(name=u_('WithDate'))
+        DBSession.add(doc)
+        DBSession.flush()
+        DBSession.commit()
+
+        assert doc.updated_at is not None
+        assert doc.updated_at.tzinfo is None
+
+    def test_timestamp_is_naive_utc_compatible_string(self):
+        value = datetime.datetime.strptime(io_utils.timestamp(), '%Y-%m-%d %H:%M:%S')
+        assert value.tzinfo is None

tox.ini

@@ -6,17 +6,12 @@
 [tox]
 skip_missing_interpreters = True
 envlist =
-    py26
-    py27
-    py33
-    py34
-    py35
-    py36
-    py37
-    py38
     py39
     py310
     py311
+    py312
+    py313
+    py314
 
 [testenv]
 setenv =
@@ -33,4 +28,3 @@ commands =
 changedir = {toxinidir}/docs
 commands = sphinx-build -b html -d _build/doctrees . _build/html
 deps = -rdocs/requirements.txt
-