From d0f4201c72559c439697f3a2e8d00f048dea6abe Mon Sep 17 00:00:00 2001
From: "Anders H. Rebner" <anderhre@stud.ntnu.no>
Date: Tue, 24 Mar 2020 18:28:58 +0100
Subject: [PATCH] #38 #39 endret json-key from og to til from_date og to_date
---
soitool/serialize_export_import_soi.py | 8 ++++----
test/test_serialize_export_import.py | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/soitool/serialize_export_import_soi.py b/soitool/serialize_export_import_soi.py
index f205764..8e5356c 100644
--- a/soitool/serialize_export_import_soi.py
+++ b/soitool/serialize_export_import_soi.py
@@ -61,9 +61,9 @@ def serialize_soi(soi):
serialized = {
"title": soi.title,
"description": soi.description,
- "date": soi.date,
"version": soi.version,
- "valid": {"from": soi.valid_from, "to": soi.valid_to},
+ "date": soi.date,
+ "valid": {"from_date": soi.valid_from, "to_date": soi.valid_to},
"icon": soi.icon,
"classification": soi.classification,
"orientation": soi.orientation,
@@ -179,8 +179,8 @@ def import_soi(file_path):
serialized["description"],
serialized["version"],
serialized["date"],
- serialized["valid"]["from"],
- serialized["valid"]["to"],
+ serialized["valid"]["from_date"],
+ serialized["valid"]["to_date"],
serialized["icon"],
serialized["classification"],
serialized["orientation"],
diff --git a/test/test_serialize_export_import.py b/test/test_serialize_export_import.py
index 5407352..5fe77ef 100644
--- a/test/test_serialize_export_import.py
+++ b/test/test_serialize_export_import.py
@@ -55,9 +55,9 @@ SCHEMA = Schema(
{
"title": And(str, len),
"description": str,
- "date": Or(str, None),
"version": And(str, len),
- "valid": {"from": Or(str, None), "to": Or(str, None)},
+ "date": Or(str, None),
+ "valid": {"from_date": Or(str, None), "to_date": Or(str, None)},
"icon": Or(str, None),
"classification": And(str, len),
"orientation": And(str, len, Or("portrait", "landscape")),
--
GitLab