use Exception(args)-style raising consistently (py3k compatibility)

mercurial/byterange.py

@@ -110,7 +110,7 b' class RangeableFileObject:'
         in self.fo.  This includes methods."""
         if hasattr(self.fo, name):
             return getattr(self.fo, name)
-        raise AttributeError, name
+        raise AttributeError(name)
 
     def tell(self):
         """Return the position within the range.
@@ -257,7 +257,7 b' class FTPRangeHandler(urllib2.FTPHandler'
     def ftp_open(self, req):
         host = req.get_host()
         if not host:
-            raise IOError, ('ftp error', 'no host given')
+            raise IOError('ftp error', 'no host given')
         host, port = splitport(host)
         if port is None:
             port = ftplib.FTP_PORT
@@ -329,7 +329,7 b' class FTPRangeHandler(urllib2.FTPHandler'
             headers = mimetools.Message(sf)
             return addinfourl(fp, headers, req.get_full_url())
         except ftplib.all_errors, msg:
-            raise IOError, ('ftp error', msg), sys.exc_info()[2]
+            raise IOError('ftp error', msg), sys.exc_info()[2]
 
     def connect_ftp(self, user, passwd, host, port, dirs):
         fw = ftpwrapper(user, passwd, host, port, dirs)
@@ -359,7 +359,7 b' class ftpwrapper(urllib.ftpwrapper):'
             try:
                 self.ftp.nlst(file)
             except ftplib.error_perm, reason:
-                raise IOError, ('ftp error', reason), sys.exc_info()[2]
+                raise IOError('ftp error', reason), sys.exc_info()[2]
             # Restore the transfer mode!
             self.ftp.voidcmd(cmd)
             # Try to retrieve as a file
@@ -373,7 +373,7 b' class ftpwrapper(urllib.ftpwrapper):'
                     fp = RangeableFileObject(fp, (rest,''))
                     return (fp, retrlen)
                 elif not str(reason).startswith('550'):
-                    raise IOError, ('ftp error', reason), sys.exc_info()[2]
+                    raise IOError('ftp error', reason), sys.exc_info()[2]
         if not conn:
             # Set transfer mode to ASCII!
             self.ftp.voidcmd('TYPE A')

mercurial/context.py

@@ -65,7 +65,7 b' class changectx(object):'
             self._parents = [changectx(self._repo, x) for x in p]
             return self._parents
         else:
-            raise AttributeError, name
+            raise AttributeError(name)
 
     def __contains__(self, key):
         return key in self._manifest
@@ -215,7 +215,7 b' class filectx(object):'
             self._repopath = self._path
             return self._repopath
         else:
-            raise AttributeError, name
+            raise AttributeError(name)
 
     def __nonzero__(self):
         try:
@@ -521,7 +521,7 b' class workingctx(changectx):'
             self._parents = [changectx(self._repo, x) for x in p]
             return self._parents
         else:
-            raise AttributeError, name
+            raise AttributeError(name)
 
     def _buildmanifest(self):
         """generate a manifest corresponding to the working directory"""
@@ -630,7 +630,7 b' class workingfilectx(filectx):'
             self._filelog = self._repo.file(self._repopath)
             return self._filelog
         else:
-            raise AttributeError, name
+            raise AttributeError(name)
 
     def __nonzero__(self):
         return True

mercurial/dirstate.py

@@ -97,7 +97,7 b' class dirstate(object):'
                 self.normalize = lambda x: x
             return self.normalize
         else:
-            raise AttributeError, name
+            raise AttributeError(name)
 
     def _join(self, f):
         # much faster than os.path.join()

mercurial/hgweb/wsgicgi.py

@@ -53,7 +53,7 b' def launch(application):'
             try:
                 if headers_sent:
                     # Re-raise original exception if headers sent
-                    raise exc_info[0], exc_info[1], exc_info[2]
+                    raise exc_info[0](exc_info[1], exc_info[2])
             finally:
                 exc_info = None     # avoid dangling circular ref
         elif headers_set:

mercurial/localrepo.py

@@ -96,7 +96,7 b' class localrepository(repo.repository):'
             self.dirstate = dirstate.dirstate(self.opener, self.ui, self.root)
             return self.dirstate
         else:
-            raise AttributeError, name
+            raise AttributeError(name)
 
     def __getitem__(self, changeid):
         if changeid == None:

mercurial/lsprof.py

@@ -25,7 +25,7 b' class Stats(object):'
     def sort(self, crit="inlinetime"):
         """XXX docstring"""
         if crit not in profiler_entry.__dict__:
-            raise ValueError, "Can't sort by %s" % crit
+            raise ValueError("Can't sort by %s" % crit)
         self.data.sort(lambda b, a: cmp(getattr(a, crit),
                                         getattr(b, crit)))
         for e in self.data:

setup.py

@@ -7,7 +7,7 b''
 
 import sys
 if not hasattr(sys, 'version_info') or sys.version_info < (2, 3, 0, 'final'):
-    raise SystemExit, "Mercurial requires python 2.3 or later."
+    raise SystemExit("Mercurial requires python 2.3 or later.")
 
 import os
 import shutil