X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=m_lib%2Fflad%2Ffladw.py;h=781c472b0437ce4cfc3f0f2358fcc2941d677956;hb=e75d2c94f9bd326ebaace635a06599a1be35b024;hp=0acc34de0c7530697841b442dd08e6d37d96ee12;hpb=87ed070d1b1776366d3ddd15eef1f37a45c585ea;p=m_lib.git diff --git a/m_lib/flad/fladw.py b/m_lib/flad/fladw.py index 0acc34d..781c472 100644 --- a/m_lib/flad/fladw.py +++ b/m_lib/flad/fladw.py @@ -34,7 +34,7 @@ class Flad_WIni(flad.Flad): if self.first_section: if string.strip(line) != '': - raise error, "non-empty line before 1st section" + 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 @@ -73,7 +73,7 @@ class Flad_WIni(flad.Flad): else: if self.first_section and (string.strip(line) != ''): - raise error, "non-empty line before 1st section" + 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)]