From 43dfe946b6385037141b94b775112037fe5f032f Mon Sep 17 00:00:00 2001
From: Sam Wenham <sam@wenhams.co.uk>
Date: Mon, 24 Feb 2020 15:04:07 +0000
Subject: Just removing dud whitespace

---
 core/views_survex.py | 46 +++++++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

(limited to 'core/views_survex.py')

diff --git a/core/views_survex.py b/core/views_survex.py
index 2582e40..cc04cb1 100644
--- a/core/views_survex.py
+++ b/core/views_survex.py
@@ -17,7 +17,7 @@ import troggle.settings as settings
 import parsers.survex
 
 survextemplatefile = """; Locn: Totes Gebirge, Austria - Loser/Augst-Eck Plateau (kataster group 1623)
-; Cave: 
+; Cave:
 
 *begin [surveyname]
 
@@ -65,7 +65,7 @@ class SvxForm(forms.Form):
     datetime = forms.DateTimeField(widget=forms.TextInput(attrs={"readonly":True}))
     outputtype = forms.CharField(widget=forms.TextInput(attrs={"readonly":True}))
     code = forms.CharField(widget=forms.Textarea(attrs={"cols":150, "rows":18}))
-    
+
     def GetDiscCode(self):
         fname = settings.SURVEX_DATA + self.data['filename'] + ".svx"
         if not os.path.isfile(fname):
@@ -75,7 +75,7 @@ class SvxForm(forms.Form):
         svxtext = ReplaceTabs(svxtext).strip()
         fin.close()
         return svxtext
-            
+
     def DiffCode(self, rcode):
         code = self.GetDiscCode()
         difftext = difflib.unified_diff(code.splitlines(), rcode.splitlines())
@@ -86,14 +86,14 @@ class SvxForm(forms.Form):
         fname = settings.SURVEX_DATA + self.data['filename'] + ".svx"
         if not os.path.isfile(fname):
             # only save if appears valid
-            if re.search(r"\[|\]", rcode):   
+            if re.search(r"\[|\]", rcode):
                 return "Error: clean up all []s from the text"
             mbeginend = re.search(r"(?s)\*begin\s+(\w+).*?\*end\s+(\w+)", rcode)
             if not mbeginend:
                 return "Error: no begin/end block here"
             if mbeginend.group(1) != mbeginend.group(2):
                 return "Error: mismatching beginend"
-                
+
         fout = open(fname, "w")
         res = fout.write(rcode.encode("latin1"))
         fout.close()
@@ -118,21 +118,21 @@ def svx(request, survex_file):
     dirname += "/"
     nowtime = datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')
     outputtype = "normal"
-    form = SvxForm({'filename':survex_file, 'dirname':dirname, 'datetime':nowtime, 'outputtype':outputtype}) 
-    
+    form = SvxForm({'filename':survex_file, 'dirname':dirname, 'datetime':nowtime, 'outputtype':outputtype})
+
     # if the form has been returned
     difflist = [ ]
     logmessage = ""
     message = ""
 
     if request.method == 'POST': # If the form has been submitted...
-        rform = SvxForm(request.POST) # 
+        rform = SvxForm(request.POST) #
         if rform.is_valid(): # All validation rules pass (how do we check it against the filename and users?)
             rcode = rform.cleaned_data['code']
             outputtype = rform.cleaned_data['outputtype']
             difflist = form.DiffCode(rcode)
             #print "ssss", rform.data
-            
+
             if "revert" in rform.data:
                 pass
             if "process" in rform.data:
@@ -153,20 +153,20 @@ def svx(request, survex_file):
                     form.data['code'] = rcode
             if "diff" in rform.data:
                 form.data['code'] = rcode
-    
-    
+
+
     #process(survex_file)
-    if 'code' not in form.data:    
+    if 'code' not in form.data:
         form.data['code'] = form.GetDiscCode()
-    
+
     if not difflist:
         difflist.append("none")
     if message:
         difflist.insert(0, message)
-    
+
     #print [ form.data['code'] ]
     svxincludes = re.findall(r'\*include\s+(\S+)(?i)', form.data['code'] or "")
-    
+
     vmap = {'settings': settings,
             'has_3d': os.path.isfile(settings.SURVEX_DATA + survex_file + ".3d"),
             'title': survex_file,
@@ -227,13 +227,13 @@ def identifycavedircontents(gcavedir):
             pass
         elif name == "115" and (f in ["115cufix.svx", "115fix.svx"]):
             pass
-        
+
         elif os.path.isdir(os.path.join(gcavedir, f)):
             if f[0] != ".":
                 subdirs.append(f)
         elif f[-4:] == ".svx":
             nf = f[:-4]
-            
+
             if nf.lower() == name.lower() or nf[:3] == "all" or (name, nf) in [("resurvey2005", "145-2005"), ("cucc", "cu115")]:
                 if primesvx:
                     if nf[:3] == "all":
@@ -272,16 +272,16 @@ def survexcaveslist(request):
         fnumlist += [ (-int(re.match(r"\d*", f).group(0) or "0"), f, area)  for f in os.listdir(cavesdir) ]
         print(fnumlist)
         print(len(fnumlist))
-    
+
     # first sort the file list
     fnumlist.sort()
-    
+
     onefilecaves = [ ]
     multifilecaves = [ ]
     subdircaves = [ ]
 
     print(fnumlist)
-    
+
     # go through the list and identify the contents of each cave directory
     for num, cavedir, area in fnumlist:
         if cavedir in ["144", "40"]:
@@ -293,10 +293,10 @@ def survexcaveslist(request):
         if os.path.isdir(gcavedir) and cavedir[0] != ".":
             subdirs, subsvx = identifycavedircontents(gcavedir)
             survdirobj = [ ]
-            
+
             for lsubsvx in subsvx:
                 survdirobj.append(("caves-" + area + "/"+cavedir+"/"+lsubsvx, lsubsvx))
-            
+
             # caves with subdirectories
             if subdirs:
                 subsurvdirs = [ ]
@@ -308,7 +308,7 @@ def survexcaveslist(request):
                         lsurvdirobj.append(("caves-" + area + "/"+cavedir+"/"+subdir+"/"+lsubsvx, lsubsvx))
                     subsurvdirs.append((lsurvdirobj[0], lsurvdirobj[1:]))
                 subdircaves.append((cavedir, (survdirobj[0], survdirobj[1:]), subsurvdirs))
-            
+
             # multifile caves
             elif len(survdirobj) > 1:
                 multifilecaves.append((survdirobj[0], survdirobj[1:]))
-- 
cgit v1.2.3