From 0f024b27f017bd9ce5cf08de4a0753a75752f993 Mon Sep 17 00:00:00 2001 From: Philip Sargent Date: Mon, 29 Mar 2021 02:06:19 +0100 Subject: Replace assert() with DataIssue message --- core/views_survex.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'core/views_survex.py') diff --git a/core/views_survex.py b/core/views_survex.py index 87f4430..0c05697 100644 --- a/core/views_survex.py +++ b/core/views_survex.py @@ -272,7 +272,7 @@ def identifycavedircontents(gcavedir): subdirs = [ ] subsvx = [ ] primesvx = None - for f in os.listdir(gcavedir): + for f in os.listdir(gcavedir): # These may get outdated as data gets tidied up. This should not be in the code! if name == "204" and (f in ["skel.svx", "template.svx", "204withents.svx"]): pass elif name == "136" and (f in ["136-noents.svx"]): @@ -289,10 +289,11 @@ def identifycavedircontents(gcavedir): if nf.lower() == name.lower() or nf[:3] == "all" or (name, nf) in [("resurvey2005", "145-2005"), ("cucc", "cu115")]: if primesvx: if nf[:3] == "all": - assert primesvx[:3] != "all", (name, nf, primesvx, gcavedir, subsvx) + #assert primesvx[:3] != "all", (name, nf, primesvx, gcavedir, subsvx) primesvx = nf else: - assert primesvx[:3] == "all", (name, nf, primesvx, gcavedir, subsvx) + #assert primesvx[:3] == "all", (name, nf, primesvx, gcavedir, subsvx) + pass else: primesvx = nf else: -- cgit v1.2.3