Merge pull request #11 from SublimeText/st2

Use Python 2.6+ style exception syntax

Author: michaelblyons

setup.py

@@ -59,10 +59,10 @@ def make_zipfile (base_name, base_dir, verbose=0, dry_run=0):
         except DistutilsExecError:
             # XXX really should distinguish between "couldn't find
             # external 'zip' command" and "zip failed".
-            raise DistutilsExecError, \
-                  ("unable to create zip file '%s': "
-                   "could neither import the 'zipfile' module nor "
-                   "find a standalone zip utility") % zip_filename
+            raise DistutilsExecError(
+                ("unable to create zip file '%s': "
+                 "could neither import the 'zipfile' module nor "
+                 "find a standalone zip utility") % zip_filename)
 
     else:
         log.info("creating '%s' and adding '%s' to it",
@@ -184,14 +184,14 @@ def finalize_options (self):
             try:
                 self.formats = [self.default_format[os.name]]
             except KeyError:
-                raise DistutilsPlatformError, \
-                      "don't know how to create source distributions " + \
-                      "on platform %s" % os.name
+                raise DistutilsPlatformError(
+                    "don't know how to create source distributions "
+                    "on platform %s" % os.name)
 
         bad_format = archive_util.check_archive_formats(self.formats)
         if bad_format:
-            raise DistutilsOptionError, \
-                  "unknown archive format '%s'" % bad_format
+            raise DistutilsOptionError(
+                "unknown archive format '%s'" % bad_format)
 
         if self.dist_dir is None:
             self.dist_dir = "dist"
@@ -405,7 +405,7 @@ def read_template (self):
 
             try:
                 self.filelist.process_template_line(line)
-            except DistutilsTemplateError, msg:
+            except DistutilsTemplateError as msg:
                 self.warn("%s, line %d: %s" % (template.filename,
                                                template.current_line,
                                                msg))
@@ -580,4 +580,4 @@ def run(self):
       author_email='guillermo@sublimetext.info',
       url='http://sublimetext.info',
       py_modules=['sublime_modelines.py']
-     )
+     )

sublime_modelines.py

@@ -107,7 +107,7 @@ def do_modelines(self, view):
             else:
                 try:
                     setter(name, to_json_type(value))
-                except ValueError, e:
+                except ValueError as e:
                     sublime.status_message("[SublimeModelines] Bad modeline detected.")
                     print "[SublimeModelines] Bad option detected: %s, %s" % (name, value)
                     print "[SublimeModelines] Tip: Keys cannot be empty strings."
@@ -116,4 +116,4 @@ def on_load(self, view):
         self.do_modelines(view)
 
     def on_post_save(self, view):
-        self.do_modelines(view)
+        self.do_modelines(view)