Merge pull request #56 from ropable/master

Refactor dewordify_txt util function to encode passed-in ASCII.
Simple logging formatter should include timestamp.

prs2/referral/models.py

@@ -1009,7 +1009,7 @@ def save(self, force_insert=False, force_update=False, *args, **kwargs):
         '''
         Overide the Note model save() to cleanse the HTML used.
         '''
-        self.note_html = unidecode(unicode(dewordify_text(self.note_html)))
+        self.note_html = dewordify_text(self.note_html)
         self.note_html = clean.clean_html(self.note_html)
         # Strip HTML tags and save as plain text.
         t = fromstring(self.note_html)
@@ -1160,15 +1160,15 @@ def save(self, force_insert=False, force_update=False, *args, **kwargs):
         Overide the Condition models's save() to cleanse the HTML input.
         '''
         if self.condition_html:
-            self.condition_html = unidecode(unicode(dewordify_text(self.condition_html)))
+            self.condition_html = dewordify_text(self.condition_html)
             self.condition_html = clean.clean_html(self.condition_html)
             t = fromstring(self.condition_html)
             self.condition = unicode(t.text_content())
         else:
             self.condition_html = ''
             self.condition = ''
         if self.proposed_condition_html:
-            self.proposed_condition_html = unidecode(unicode(dewordify_text(self.proposed_condition_html)))
+            self.proposed_condition_html = dewordify_text(self.proposed_condition_html)
             self.proposed_condition_html = clean.clean_html(self.proposed_condition_html)
             t = fromstring(self.proposed_condition_html)
             self.proposed_condition = unicode(t.text_content())

prs2/referral/utils.py

@@ -10,6 +10,7 @@
 import json
 from reversion.models import Version
 import re
+from unidecode import unidecode
 
 
 def is_model_or_string(model):
@@ -72,16 +73,17 @@ def replacer(m):
     return REPLACEMENTS[m.group(0)]
 
 
-def dewordify_text(x):
+def dewordify_text(txt):
     '''
     Function to strip some of the crufty HTML that results from copy-pasting from Word into the
     RTF text fields in this application.
     Source:
             http://stackoverflow.com/questions/1175540/iterative-find-replace-from-a-list-of-tuples-in-python
     '''
-    if x:
+    if txt:
+        txt = unidecode(unicode(txt))
         r = re.compile('|'.join(REPLACEMENTS.keys()))
-        return r.sub(replacer, x)
+        return r.sub(replacer, txt)
     else:
         return ''
 

prs2/settings.py

@@ -179,7 +179,7 @@
     'disable_existing_loggers': False,
     'formatters': {
         'simple': {
-            'format': '%(levelname)s %(message)s'
+            'format': '%(levelname)s %(asctime)s %(message)s'
         },
     },
     'handlers': {