changeset 623:5f499a634857

FormSubmit: fix pep8, remove unused imports, ...
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Mon, 25 Mar 2013 17:20:34 +0100
parents 12465aa315be
children bdebdc59b057
files data/plugin/action/loadactions.py data/plugin/action/submitattachment.py data/plugin/action/submitbase.py data/plugin/action/submitcsv.py data/plugin/action/submitemail.py
diffstat 5 files changed, 31 insertions(+), 37 deletions(-) [+]
line wrap: on
line diff
--- a/data/plugin/action/loadactions.py	Mon Mar 25 17:09:15 2013 +0100
+++ b/data/plugin/action/loadactions.py	Mon Mar 25 17:20:34 2013 +0100
@@ -1,5 +1,4 @@
 # -*- coding: iso-8859-1 -*-
-
 """
     MoinMoin - loadactions Action
     
@@ -11,8 +10,6 @@
     @license: GNU GPL, see COPYING for details.
 """
 
-import os, sys
-
 from MoinMoin import wikiutil
 from MoinMoin.Page import Page
 from MoinMoin.action import ActionBase
@@ -20,12 +17,12 @@
 
 from submitbase import SubmitError
 
+
 def execute(pagename, request):
     for action in request.form.get("actions[]"):
         handler = getHandler(request, action)
         try:
             handler(pagename, request)
         except SubmitError:
-            # Stop executing next actions while there is an error
+            # Stop executing next actions if there is an error
             break
-         
--- a/data/plugin/action/submitattachment.py	Mon Mar 25 17:09:15 2013 +0100
+++ b/data/plugin/action/submitattachment.py	Mon Mar 25 17:20:34 2013 +0100
@@ -1,5 +1,4 @@
 # -*- coding: iso-8859-1 -*-
-
 """
     MoinMoin - submitattachment Action
 
@@ -13,17 +12,17 @@
     @license: GNU GPL, see COPYING for details.
 """
 
-import os, sys, copy
-
 from MoinMoin import wikiutil
 from MoinMoin.Page import Page
 from MoinMoin.action import AttachFile
 
 from submitbase import SubmitBase, SubmitValidationError
 
+
 def execute(pagename, request):
     submitattachment(pagename, request).render()
 
+
 class submitattachment(SubmitBase):
     
     def rewrite_filename(self, filename):
@@ -36,7 +35,7 @@
             attachFileSplit = attachFile.split(".", 2)
             ext = attachFileSplit.pop()
             name = '.'.join(attachFileSplit)
-            attachFile = "%(name)s_%(index)d.%(extension)s" % {'name':name, 'index':i, 'extension':ext}
+            attachFile = "%(name)s_%(index)d.%(extension)s" % {'name': name, 'index': i, 'extension': ext}
             i += 1
             
         filename = attachFile
@@ -52,7 +51,7 @@
             raise SubmitValidationError(self.msg)
         
         if not self.attachContent:
-            self.msg = self._("Invalid file '%(file)s'") % {'file' : self.attachFile}
+            self.msg = self._("Invalid file '%(file)s'") % {'file': self.attachFile}
             raise SubmitValidationError(self.msg)
      
     def sanitize(self):
@@ -61,7 +60,3 @@
          
     def submit(self):
         AttachFile.add_attachment(self.request, self.targetpage, self.attachFile, self.attachContent, 0)
-        
-        
-    
-    
--- a/data/plugin/action/submitbase.py	Mon Mar 25 17:09:15 2013 +0100
+++ b/data/plugin/action/submitbase.py	Mon Mar 25 17:20:34 2013 +0100
@@ -1,5 +1,4 @@
 # -*- coding: iso-8859-1 -*-
-
 """
     MoinMoin - submitbase Action
 
@@ -18,7 +17,7 @@
     @license: GNU GPL, see COPYING for details.
 """
 
-import os, sys, copy, codecs
+import copy
 
 from MoinMoin import wikiutil
 from MoinMoin.action import ActionBase
@@ -27,9 +26,11 @@
 from MoinMoin.action import getHandler
 from MoinMoin.security.textcha import TextCha
 
+
 def execute(pagename, request):
     raise NotImplementedError
 
+
 class SubmitBase(ActionBase):
     """ submit base class with some generic stuff to inherit """
     
@@ -48,8 +49,8 @@
         'file__filename__', 
         'uploadlabel',
         'textcha-question',
-        'textcha-answer'
-        ]
+        'textcha-answer',
+    ]
     
     def __init__(self, pagename, request):
         ActionBase.__init__(self, pagename, request)
@@ -150,7 +151,7 @@
             except SubmitValidationError:
                 return False, self.msg
             except Exception, e:
-                """ TODO: Log exception """
+                # TODO: Log exception
                 return False, e
         else:
             try:
@@ -159,8 +160,7 @@
                 self.submit()
             except SubmitValidationError:
                 return False, self.msg
-            
-        
+
         self.msg = self._("Data has been processed successfuly")
         
         return True, self.msg
@@ -230,14 +230,15 @@
                 labels.append(label)
                 values.append(fields[label])
         else:
-            labels = fields.keys();
-            values = fields.values();
+            labels = fields.keys()
+            values = fields.values()
         
         return labels, values
-            
+
+
 class SubmitError(Exception):
     """ Exception raised for submit action errors """
-    
+
+
 class SubmitValidationError(Exception):
     """ Exception raised for errors during validation """
-    
--- a/data/plugin/action/submitcsv.py	Mon Mar 25 17:09:15 2013 +0100
+++ b/data/plugin/action/submitcsv.py	Mon Mar 25 17:20:34 2013 +0100
@@ -1,5 +1,4 @@
 # -*- coding: iso-8859-1 -*-
-
 """
     MoinMoin - submitcsv Action
     
@@ -11,7 +10,10 @@
     @license: GNU GPL, see COPYING for details.
 """
 
-import os, csv, sys, codecs, cStringIO
+import os
+import csv
+import codecs
+import cStringIO
 
 from MoinMoin import config, wikiutil
 from MoinMoin.Page import Page
@@ -19,9 +21,11 @@
 
 from submitbase import SubmitBase
 
+
 def execute(pagename, request):
     submitcsv(pagename, request).render()           
 
+
 class submitcsv(SubmitBase):
         
     def __init__(self, pagename, request):
@@ -76,7 +80,8 @@
         writer.writerow(self.values)
         
         fh.close()
-        
+
+
 class UnicodeWriter:
     """
     A CSV writer which will write rows to CSV file "f",
@@ -105,5 +110,3 @@
     def writerows(self, rows):
         for row in rows:
             self.writerow(row)
-     
-    
--- a/data/plugin/action/submitemail.py	Mon Mar 25 17:09:15 2013 +0100
+++ b/data/plugin/action/submitemail.py	Mon Mar 25 17:20:34 2013 +0100
@@ -9,8 +9,6 @@
     @license: GNU GPL, see COPYING for details.
 """
 
-import os, sys, codecs
-
 from MoinMoin import wikiutil
 from MoinMoin.action import ActionBase
 from MoinMoin.Page import Page
@@ -18,9 +16,11 @@
 
 from submitbase import SubmitBase
 
+
 def execute(pagename, request):
     submitemail(pagename, request).render()
 
+
 class submitemail(SubmitBase):          
     
     def __init__(self, pagename, request):
@@ -39,8 +39,7 @@
             index = self.labels.index(label)
             label = label.decode('utf-8')
             value = self.values[index]
-            text += "%(label)s: %(value)s \n" % {'label': label, 'value':value}
-        
+            text += "%(label)s: %(value)s \n" % {'label': label, 'value': value}
         return text
         
     def submit(self):
@@ -48,6 +47,5 @@
         text = self.build_content()
         status, msg = sendmail(self.request, self.targetemail, self.subject, text, mail_from=self.targetemail)
         self.msg = self._(msg)
-        if status!=1:
+        if status != 1:
             raise Exception(self.msg)
-