X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=m_lib%2Fflad%2Ffladw.py;h=ccbd5d53ed4202f1e985b9c30417ad4f9ba16964;hb=c8455bf373d58d8b2928ba3d56488318f4095b83;hp=c50d410367e825660e4185e97b96031af7002a10;hpb=8d79317cdc8220ff3c2192e68fc1dfc749c3ea1c;p=m_lib.git

diff --git a/m_lib/flad/fladw.py b/m_lib/flad/fladw.py
index c50d410..ccbd5d5 100644
--- a/m_lib/flad/fladw.py
+++ b/m_lib/flad/fladw.py
@@ -4,7 +4,7 @@
 
 
 import string, re
-import flad
+from m_lib.flad import flad
 
 
 error = "fladw.error"
@@ -33,8 +33,8 @@ 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 string.strip(line) != '':
+            raise error("non-empty line before 1st section")
 
       elif (string.strip(line) == '') or (string.lstrip(line)[0] == ';') : # Empty line or comment
          record[0].append(line)
@@ -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 (string.strip(line) != ''):
+               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
@@ -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)]