zaklad poctiveho jakobsenova algoritmu

[krypto.git] / ocesavac.py

diff --git a/ocesavac.py b/ocesavac.py
index 31e49fb..15a79fb 100644 (file)
--- a/ocesavac.py
+++ b/ocesavac.py
@@ -1,25 +1,29 @@
-import unicodedata
+"""Modul pro odstranovani diakritiky a zvlastnich znaku."""

 
 

-ABECEDA = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+import unicodedata
+from spolecne import ABECEDA

 
 def deaccent(unistr):
 
 def deaccent(unistr):

+    """Vrati text bez akcentu. Pochybna metoda pouzivajici unicodedata."""

     return ''.join(aChar 
                    for aChar in unicodedata.normalize('NFD', unistr) 
                    if not unicodedata.combining(aChar))
 
 def ocesat(text, mezery=True):
     return ''.join(aChar 
                    for aChar in unicodedata.normalize('NFD', unistr) 
                    if not unicodedata.combining(aChar))
 
 def ocesat(text, mezery=True):

+    """Odstrani z textu akcenty, zvlastni znaky nahradi mezerami, posloupnost
+    mezer jednou mezerou a prevede vsechna pismena na velka."""

     text = deaccent(unicode(text)).upper()
     if mezery:
         pole = [' ']
     text = deaccent(unicode(text)).upper()
     if mezery:
         pole = [' ']

-        lastWh = True
-        for c in text:
-            if c in ABECEDA:
-                pole.append(c)
-                lastWh = False
-            elif not lastWh:
+        last_white = True
+        for char in text:
+            if char in ABECEDA:
+                pole.append(char)
+                last_white = False
+            elif not last_white:

                 pole.append(' ')
                 pole.append(' ')

-                lastWh = True
-        if not lastWh:
+                last_white = True
+        if not last_white:

             pole.append(' ')
         return ''.join(pole)
     else: # bez mezer
             pole.append(' ')
         return ''.join(pole)
     else: # bez mezer