Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/Ultimaker/Cura.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGhostkeeper <rubend@tutanota.com>2018-07-04 18:30:01 +0300
committerGhostkeeper <rubend@tutanota.com>2018-07-04 18:30:01 +0300
commitc9480f2f2bd406e25ab073d14311719c2363cfe4 (patch)
tree067fc7a4782938031426be0c7491e52f9d76cfe9 /cura/Backups
parent715eda4f5917018553bf6f0d5b4b62e94d5f8a20 (diff)
Add types for backup metadata
Diffstat (limited to 'cura/Backups')
-rw-r--r--cura/Backups/Backup.py7
-rw-r--r--cura/Backups/BackupsManager.py13
2 files changed, 11 insertions, 9 deletions
diff --git a/cura/Backups/Backup.py b/cura/Backups/Backup.py
index f935aa6af5..cc47df770e 100644
--- a/cura/Backups/Backup.py
+++ b/cura/Backups/Backup.py
@@ -1,12 +1,13 @@
# Copyright (c) 2018 Ultimaker B.V.
# Cura is released under the terms of the LGPLv3 or higher.
+
import io
import os
import re
import shutil
-from typing import Optional
+from typing import Dict, Optional
from zipfile import ZipFile, ZIP_DEFLATED, BadZipfile
from UM import i18nCatalog
@@ -28,9 +29,9 @@ class Backup:
# Re-use translation catalog.
catalog = i18nCatalog("cura")
- def __init__(self, zip_file: bytes = None, meta_data: dict = None) -> None:
+ def __init__(self, zip_file: bytes = None, meta_data: Dict[str, str] = None) -> None:
self.zip_file = zip_file # type: Optional[bytes]
- self.meta_data = meta_data # type: Optional[dict]
+ self.meta_data = meta_data # type: Optional[Dict[str, str]]
## Create a back-up from the current user config folder.
def makeFromCurrent(self) -> None:
diff --git a/cura/Backups/BackupsManager.py b/cura/Backups/BackupsManager.py
index bc560a8dd9..67e2a222f1 100644
--- a/cura/Backups/BackupsManager.py
+++ b/cura/Backups/BackupsManager.py
@@ -1,6 +1,7 @@
# Copyright (c) 2018 Ultimaker B.V.
# Cura is released under the terms of the LGPLv3 or higher.
-from typing import Optional, Tuple
+
+from typing import Dict, Optional, Tuple
from UM.Logger import Logger
from cura.Backups.Backup import Backup
@@ -18,7 +19,7 @@ class BackupsManager:
## Get a back-up of the current configuration.
# \return A tuple containing a ZipFile (the actual back-up) and a dict
# containing some metadata (like version).
- def createBackup(self) -> Tuple[Optional[bytes], Optional[dict]]:
+ def createBackup(self) -> Tuple[Optional[bytes], Optional[Dict[str, str]]]:
self._disableAutoSave()
backup = Backup()
backup.makeFromCurrent()
@@ -30,7 +31,7 @@ class BackupsManager:
# \param zip_file A bytes object containing the actual back-up.
# \param meta_data A dict containing some metadata that is needed to
# restore the back-up correctly.
- def restoreBackup(self, zip_file: bytes, meta_data: dict) -> None:
+ def restoreBackup(self, zip_file: bytes, meta_data: Dict[str, str]) -> None:
if not meta_data.get("cura_release", None):
# If there is no "cura_release" specified in the meta data, we don't execute a backup restore.
Logger.log("w", "Tried to restore a backup without specifying a Cura version number.")
@@ -43,13 +44,13 @@ class BackupsManager:
if restored:
# At this point, Cura will need to restart for the changes to take effect.
# We don't want to store the data at this point as that would override the just-restored backup.
- self._application.windowClosed(save_data=False)
+ self._application.windowClosed(save_data = False)
## Here we try to disable the auto-save plug-in as it might interfere with
# restoring a back-up.
- def _disableAutoSave(self):
+ def _disableAutoSave(self) -> None:
self._application.setSaveDataEnabled(False)
## Re-enable auto-save after we're done.
- def _enableAutoSave(self):
+ def _enableAutoSave(self) -> None:
self._application.setSaveDataEnabled(True)