diff --git a/setup.py b/setup.py index 4ea1fa73..6222bc6f 100755 --- a/setup.py +++ b/setup.py @@ -74,10 +74,11 @@ class Uninstall(Command): def run(self): self.ensure_filename('manifest') try: - f = open(self.manifest) - files = [file.strip() for file in f] - except IOError, e: - raise DistutilsFileError("unable to open install manifest: %s", str(e)) + try: + f = open(self.manifest) + files = [file.strip() for file in f] + except IOError, e: + raise DistutilsFileError("unable to open install manifest: %s", str(e)) finally: f.close() diff --git a/terminatorlib/configfile.py b/terminatorlib/configfile.py index f7c0374e..1437f1c2 100644 --- a/terminatorlib/configfile.py +++ b/terminatorlib/configfile.py @@ -167,10 +167,11 @@ class ConfigFile: def _line_ok(self): if self._currvalue is None: return else: - try: - self.callback(self._currsection, self._currsetting, self._currvalue) - except ValueError, e: - raise ConfigSyntaxError(str(e), self) + try: # *glares at 2.4 users* + try: + self.callback(self._currsection, self._currsetting, self._currvalue) + except ValueError, e: + raise ConfigSyntaxError(str(e), self) finally: self._currvalue = None