X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=m_lib%2Fflad%2Ffladw.py;h=fa0007443d7060a54257a416ab60d2d6160f11b5;hb=4dedeb2041f8b9f7796991c2ff513f9e3aa8b386;hp=0acc34de0c7530697841b442dd08e6d37d96ee12;hpb=87ed070d1b1776366d3ddd15eef1f37a45c585ea;p=m_lib.git

diff --git a/m_lib/flad/fladw.py b/m_lib/flad/fladw.py
index 0acc34d..fa00074 100644
--- a/m_lib/flad/fladw.py
+++ b/m_lib/flad/fladw.py
@@ -3,8 +3,8 @@
 """
 
 
-import string, re
-import flad
+import re
+from m_lib.flad import flad
 
 
 error = "fladw.error"
@@ -33,10 +33,10 @@ class Flad_WIni(flad.Flad):
          return match.group(1) # Signal to stop filling the record (section) and start a new one
 
       if self.first_section:
-         if string.strip(line) != '':
-            raise error, "non-empty line before 1st section"
+         if line.strip() != '':
+            raise error("non-empty line before 1st section")
 
-      elif (string.strip(line) == '') or (string.lstrip(line)[0] == ';') : # Empty line or comment
+      elif (line.strip() == '') or (line.lstrip()[0] == ';') : # Empty line or comment
          record[0].append(line)
 
       else:
@@ -46,7 +46,7 @@ class Flad_WIni(flad.Flad):
                                   # so it is not ready to be checked :(
                                   # And, of course, two keys with the same name
                                   # cannot be added to dictionary
-            raise KeyError, "field key \"" + key + "\" already in record"
+            raise KeyError("field key \"" + key + "\" already in record")
 
          record[0].append(key)
          record[1][key] = value
@@ -72,8 +72,8 @@ class Flad_WIni(flad.Flad):
                self.section = section
 
          else:
-            if self.first_section and (string.strip(line) != ''):
-               raise error, "non-empty line before 1st section"
+            if self.first_section and (line.strip() != ''):
+               raise error("non-empty line before 1st section")
             # else: line had been appended to section in __parse_line()
 
       else: # This called after last line of the source file
@@ -85,7 +85,7 @@ class Flad_WIni(flad.Flad):
             klist = record[1]
             if klist:
                l = len(klist) - 1
-               if string.strip(klist[l]) == '':
+               if klist[l].strip() == '':
                   del klist[l]
 
       return 0
@@ -110,7 +110,7 @@ class Flad_WIni(flad.Flad):
 
          if record[1]:
             for key in record[1]:
-               if string.strip(key) == '' or string.lstrip(key)[0] == ';' :
+               if key.strip() == '' or key.lstrip()[0] == ';' :
                   outfile.write(key)
                else:
                   outfile.write(key + self.key_sep + record[2][key] + '\n')
@@ -131,7 +131,7 @@ class Flad_WIni(flad.Flad):
    def add_section(self, section):
       rec_no = self.find_section(section)
       if rec_no >= 0:
-         raise section_error, "section [%s] already exists" % section
+         raise section_error("section [%s] already exists" % section)
 
       self.append((section, [], {}))
 
@@ -139,7 +139,7 @@ class Flad_WIni(flad.Flad):
    def del_section(self, section):
       rec_no = self.find_section(section)
       if rec_no < 0:
-         raise section_error, "section [%s] does not exists" % section
+         raise section_error("section [%s] does not exists" % section)
 
       del self[rec_no]
 
@@ -160,11 +160,11 @@ class Flad_WIni(flad.Flad):
    def get_keyvalue(self, section, key):
       rec_no = self.find_section(section)
       if rec_no < 0:
-         raise section_error, "section [%s] does not exists" % section
+         raise section_error("section [%s] does not exists" % section)
 
       record = self[rec_no]
       if key not in record[1]:
-         raise KeyError, "section [%s] does not has `%s' key" % (section, key)
+         raise KeyError("section [%s] does not has `%s' key" % (section, key))
 
       return record[2][key]
 
@@ -184,11 +184,11 @@ class Flad_WIni(flad.Flad):
    def del_key(self, section, key):
       rec_no = self.find_section(section)
       if rec_no < 0:
-         raise section_error, "section [%s] does not exists" % section
+         raise section_error("section [%s] does not exists" % section)
 
       record = self[rec_no]
       if key not in record[1]:
-         raise KeyError, "section [%s] does not has `%s' key" % (section, key)
+         raise KeyError("section [%s] does not has `%s' key" % (section, key))
 
       klist = record[1]
       del klist[klist.index(key)]