chellow 1707319125.0.0__tar.gz → 1707388338.0.0__tar.gz

{chellow-1707319125.0.0 → chellow-1707388338.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: chellow
-Version: 1707319125.0.0
+Version: 1707388338.0.0
 Summary: Web Application for checking UK energy bills.
 Project-URL: Homepage, https://github.com/WessexWater/chellow
 Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)

chellow-1707388338.0.0/VERSION

@@ -0,0 +1 @@
+__version__ = "1707388338.0.0"

{chellow-1707319125.0.0 → chellow-1707388338.0.0}/chellow/dloads.py

@@ -76,7 +76,7 @@ class DloadFile:
         self.close()
 
 
-def make_names(base, user):
+def open_file(base, user, mode="r", newline=None, is_zip=False):
     global download_id
 
     base = base.replace("/", "").replace(" ", "")
@@ -99,11 +99,7 @@ def make_names(base, user):
         uname = un.replace("@", "").replace(".", "").replace("\\", "")
 
     names = tuple("_".join((serial, v, uname, base)) for v in ("RUNNING", "FINISHED"))
-    return tuple(download_path / name for name in names)
-
-
-def open_file(base, user, mode="r", newline=None, is_zip=False):
-    running_name, finished_name = make_names(base, user)
+    running_name, finished_name = tuple(download_path / name for name in names)
     return DloadFile(running_name, finished_name, mode, newline, is_zip)
 
 

{chellow-1707319125.0.0 → chellow-1707388338.0.0}/chellow/reports/report_g_monthly_duration.py

@@ -1,4 +1,3 @@
-import os
 import sys
 import threading
 import traceback
@@ -14,7 +13,7 @@ from sqlalchemy.sql.expression import null
 from werkzeug.exceptions import BadRequest
 
 import chellow.e.computer
-from chellow.dloads import make_names, open_file
+from chellow.dloads import open_file
 from chellow.e.computer import contract_func
 from chellow.gas.engine import GDataSource
 from chellow.models import (
@@ -203,8 +202,7 @@ def content(
                 base_name.append(str(g_supply.id))
                 sites = sites.filter(GEra.g_supply == g_supply)
 
-            running_name, finished_name = make_names("_".join(base_name) + ".ods", user)
-            rf = open(running_name, mode="wb")
+            rf = open_file("_".join(base_name) + ".ods", user, mode="wb")
             site_rows = []
             g_era_rows = []
 
@@ -345,7 +343,6 @@ def content(
     finally:
         try:
             rf.close()
-            os.rename(running_name, finished_name)
         except BaseException:
             msg = traceback.format_exc()
             ef = open_file("error.txt", user, mode="w")

{chellow-1707319125.0.0 → chellow-1707388338.0.0}/test/reports/test_g_monthly_duration.py

@@ -196,14 +196,9 @@ def virtual_bill(ds):
     mock_file = BytesIO()
     mock_file.close = mocker.Mock()
     mocker.patch(
-        "chellow.reports.report_g_monthly_duration.make_names",
-        return_value=("a", "b"),
-    )
-    mocker.patch(
-        "chellow.reports.report_g_monthly_duration.open",
+        "chellow.reports.report_g_monthly_duration.open_file",
         return_value=mock_file,
     )
-    mocker.patch("chellow.reports.report_g_monthly_duration.os.rename")
 
     user = mocker.Mock()
     site_id = site.id

chellow-1707319125.0.0/VERSION

@@ -1 +0,0 @@
-__version__ = "1707319125.0.0"