---
urlgrabber/byterange.py | 10 +++++-----
urlgrabber/grabber.py | 8 ++++----
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/urlgrabber/byterange.py b/urlgrabber/byterange.py
index 8eeaeda..e30cd48 100644
--- a/urlgrabber/byterange.py
+++ b/urlgrabber/byterange.py
@@ -120,7 +120,7 @@ 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.
@@ -266,7 +266,7 @@ 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
@@ -339,7 +339,7 @@ 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)
def connect_ftp(self, user, passwd, host, port, dirs):
fw = ftpwrapper(user, passwd, host, port, dirs)
@@ -365,7 +365,7 @@ 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)
# Restore the transfer mode!
self.ftp.voidcmd(cmd)
# Try to retrieve as a file
@@ -379,7 +379,7 @@ class ftpwrapper(urllib.ftpwrapper):
fp = RangeableFileObject(fp, (rest,''))
return (fp, retrlen)
elif str(reason)[:3] != '550':
- raise IOError, ('ftp error', reason), sys.exc_info()[2]
+ raise IOError('ftp error', reason)
if not conn:
# Set transfer mode to ASCII!
self.ftp.voidcmd('TYPE A')
diff --git a/urlgrabber/grabber.py b/urlgrabber/grabber.py
index 83823ea..02898cb 100644
--- a/urlgrabber/grabber.py
+++ b/urlgrabber/grabber.py
@@ -838,7 +838,7 @@ class URLGrabberOptions:
def __getattr__(self, name):
if self.delegate and hasattr(self.delegate, name):
return getattr(self.delegate, name)
- raise AttributeError, name
+ raise AttributeError(name)
def raw_throttle(self):
"""Calculate raw throttle value from throttle and bandwidth
@@ -1195,7 +1195,7 @@ class PyCurlFileObject(object):
self.reget_time = None
self.opts = opts
if self.opts.reget == 'check_timestamp':
- raise NotImplementedError, "check_timestamp regets are not
implemented in this ver of urlgrabber. Please report this."
+ raise NotImplementedError("check_timestamp regets are not
implemented in this ver of urlgrabber. Please report this.")
self._complete = False
self._rbuf = ''
self._rbufsize = 1024*8
@@ -1217,7 +1217,7 @@ class PyCurlFileObject(object):
if hasattr(self.fo, name):
return getattr(self.fo, name)
- raise AttributeError, name
+ raise AttributeError(name)
def _retrieve(self, buf):
try:
@@ -1935,7 +1935,7 @@ def _dumps(v):
return "(%s)" % ','.join(map(_dumps, v))
if type(v) == list:
return "[%s]" % ','.join(map(_dumps, v))
- raise TypeError, 'Can\'t serialize %s' % v
+ raise TypeError('Can\'t serialize %s' % v)
def _loads(s):
def decode(v):
--
1.7.4.4
_______________________________________________
Yum-devel mailing list
[email protected]
http://lists.baseurl.org/mailman/listinfo/yum-devel
