devel/python-urlgrabber urlgrabber-3.0.0-cleanup.patch, NONE, 1.1 python-urlgrabber.spec, 1.22, 1.23

[Jeremy Katz (katzj)]

Author: katzj

Update of /cvs/pkgs/devel/python-urlgrabber
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6076

Modified Files:
	python-urlgrabber.spec 
Added Files:
	urlgrabber-3.0.0-cleanup.patch 
Log Message:
* Mon Dec  3 2007 Jeremy Katz <katzj at redhat.com> - 3.0.0-4
- Ensure fds are closed on exceptions (markmc, #404211)


urlgrabber-3.0.0-cleanup.patch:

--- NEW FILE urlgrabber-3.0.0-cleanup.patch ---
diff -up urlgrabber-3.0.0/urlgrabber/grabber.py.cleanup urlgrabber-3.0.0/urlgrabber/grabber.py
--- urlgrabber-3.0.0/urlgrabber/grabber.py.cleanup	2007-11-29 10:25:13.000000000 +0000
+++ urlgrabber-3.0.0/urlgrabber/grabber.py	2007-11-29 10:26:15.000000000 +0000
@@ -1204,16 +1204,18 @@ class URLGrabberFileObject:
         bs = 1024*8
         size = 0
 
-        if amount is not None: bs = min(bs, amount - size)
-        block = self.read(bs)
-        size = size + len(block)
-        while block:
-            new_fo.write(block)
+        try:
             if amount is not None: bs = min(bs, amount - size)
             block = self.read(bs)
             size = size + len(block)
+            while block:
+                new_fo.write(block)
+                if amount is not None: bs = min(bs, amount - size)
+                block = self.read(bs)
+                size = size + len(block)
+        finally:
+            new_fo.close()
 
-        new_fo.close()
         try:
             modified_tuple  = self.hdr.getdate_tz('last-modified')
             modified_stamp  = rfc822.mktime_tz(modified_tuple)


Index: python-urlgrabber.spec
===================================================================
RCS file: /cvs/pkgs/devel/python-urlgrabber/python-urlgrabber.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- python-urlgrabber.spec	10 Oct 2007 15:39:20 -0000	1.22
+++ python-urlgrabber.spec	3 Dec 2007 16:58:03 -0000	1.23
@@ -3,10 +3,11 @@
 Summary: A high-level cross-protocol url-grabber
 Name: python-urlgrabber
 Version: 3.0.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 Source0: urlgrabber-%{version}.tar.gz
 Patch0: urlgrabber-keepalive.patch
 Patch1: urlgrabber-string-type.patch
+Patch2: urlgrabber-3.0.0-cleanup.patch
 License: LGPLv2+
 Group: Development/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -24,6 +25,7 @@
 %setup -q -n urlgrabber-%{version}
 %patch0 -p0
 %patch1 -p1
+%patch2 -p1
 
 %build
 python setup.py build
@@ -43,6 +45,9 @@
 %{_bindir}/urlgrabber
 
 %changelog
+* Mon Dec  3 2007 Jeremy Katz <katzj at redhat.com> - 3.0.0-4
+- Ensure fds are closed on exceptions (markmc, #404211)
+
 * Wed Oct 10 2007 Jeremy Katz <katzj at redhat.com> - 3.0.0-3
 - fix type checking of strings to also include unicode strings; fixes 
   regets from yum (#235618)