rpms/python-urlgrabber/F-7 urlgrabber-string-type.patch, NONE, 1.1 python-urlgrabber.spec, 1.19, 1.20 sources, 1.5, 1.6
Jeremy Katz (katzj)
fedora-extras-commits at redhat.com
Wed Oct 10 16:38:41 UTC 2007
Author: katzj
Update of /cvs/pkgs/rpms/python-urlgrabber/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26464
Modified Files:
python-urlgrabber.spec sources
Added Files:
urlgrabber-string-type.patch
Log Message:
* 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)
urlgrabber-string-type.patch:
--- NEW FILE urlgrabber-string-type.patch ---
diff -up urlgrabber-3.0.0/urlgrabber/progress.py.type urlgrabber-3.0.0/urlgrabber/progress.py
--- urlgrabber-3.0.0/urlgrabber/progress.py.type 2007-10-10 11:34:55.000000000 -0400
+++ urlgrabber-3.0.0/urlgrabber/progress.py 2007-10-10 11:36:50.000000000 -0400
@@ -23,6 +23,7 @@ import sys
import time
import math
import thread
+import types
class BaseMeter:
def __init__(self):
@@ -343,7 +344,7 @@ class TextMultiFileMeter(MultiFileMeter)
try:
format = "%-30.30s %6.6s %s"
fn = meter.basename
- if type(message) in (type(''), type(u'')):
+ if type(message) in types.StringTypes:
message = message.splitlines()
if not message: message = ['']
out = '%-79s' % (format % (fn, 'FAILED', message[0] or ''))
diff -up urlgrabber-3.0.0/urlgrabber/mirror.py.type urlgrabber-3.0.0/urlgrabber/mirror.py
--- urlgrabber-3.0.0/urlgrabber/mirror.py.type 2007-10-10 11:35:22.000000000 -0400
+++ urlgrabber-3.0.0/urlgrabber/mirror.py 2007-10-10 11:36:14.000000000 -0400
@@ -90,6 +90,7 @@ CUSTOMIZATION
import random
import thread # needed for locking to make this threadsafe
+import types
from grabber import URLGrabError, CallbackObject, DEBUG
@@ -266,7 +267,7 @@ class MirrorGroup:
def _parse_mirrors(self, mirrors):
parsed_mirrors = []
for m in mirrors:
- if type(m) == type(''): m = {'mirror': m}
+ if type(m) in types.StringTypes: m = {'mirror': m}
parsed_mirrors.append(m)
return parsed_mirrors
diff -up urlgrabber-3.0.0/urlgrabber/grabber.py.type urlgrabber-3.0.0/urlgrabber/grabber.py
--- urlgrabber-3.0.0/urlgrabber/grabber.py.type 2007-10-10 11:34:50.000000000 -0400
+++ urlgrabber-3.0.0/urlgrabber/grabber.py 2007-10-10 11:35:51.000000000 -0400
@@ -372,6 +372,7 @@ import sys
import urlparse
import rfc822
import time
+import types
import string
import urllib
import urllib2
@@ -1128,7 +1129,7 @@ class URLGrabberFileObject:
self.append = 0
reget_length = 0
rt = None
- if have_range and self.opts.reget and type(self.filename) == type(''):
+ if have_range and self.opts.reget and type(self.filename) in types.StringTypes:
# we have reget turned on and we're dumping to a file
try:
s = os.stat(self.filename)
Index: python-urlgrabber.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-urlgrabber/F-7/python-urlgrabber.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- python-urlgrabber.spec 6 Dec 2006 21:47:18 -0000 1.19
+++ python-urlgrabber.spec 10 Oct 2007 16:38:09 -0000 1.20
@@ -2,16 +2,14 @@
Summary: A high-level cross-protocol url-grabber
Name: python-urlgrabber
-Version: 2.9.9
-Release: 5%{?dist}
+Version: 3.0.0
+Release: 3%{?dist}
Source0: urlgrabber-%{version}.tar.gz
-Patch0: urlgrabber-read-error.patch
-Patch1: urlgrabber-ssl-byterange-keepalive.patch
-Patch2: urlgrabber-keepalive.patch
-License: LGPL
+Patch0: urlgrabber-keepalive.patch
+Patch1: urlgrabber-string-type.patch
+License: LGPLv2+
Group: Development/Libraries
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-Prefix: %{_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildArch: noarch
BuildRequires: python-devel
Url: http://linux.duke.edu/projects/urlgrabber/
@@ -23,15 +21,15 @@
authentication, proxies and more.
%prep
-%setup -n urlgrabber-%{version}
+%setup -q -n urlgrabber-%{version}
%patch0 -p0
-%patch1 -p0
-%patch2 -p0
+%patch1 -p1
%build
python setup.py build
%install
+rm -rf $RPM_BUILD_ROOT
python setup.py install -O1 --root=$RPM_BUILD_ROOT
rm -rf $RPM_BUILD_ROOT/%{_docdir}/urlgrabber-%{version}
@@ -39,13 +37,22 @@
rm -rf $RPM_BUILD_ROOT
%files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
%doc ChangeLog LICENSE README TODO
-%dir %{python_sitelib}/urlgrabber
-%{python_sitelib}/urlgrabber/*
+%{python_sitelib}/urlgrabber
%{_bindir}/urlgrabber
%changelog
+* 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)
+
+* Mon Aug 27 2007 Jeremy Katz <katzj at redhat.com> - 3.0.0-2
+- fixes for package review (#226347)
+
+* Thu May 31 2007 Jeremy Katz <katzj at redhat.com> - 3.0.0-1
+- update to 3.0.0
+
* Wed Dec 6 2006 Jeremy Katz <katzj at redhat.com> - 2.9.9-5
- rebuild for python 2.5
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-urlgrabber/F-7/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 16 May 2006 21:08:47 -0000 1.5
+++ sources 10 Oct 2007 16:38:09 -0000 1.6
@@ -1 +1 @@
-a1001edcc026de2848714b81e5bdb939 urlgrabber-2.9.9.tar.gz
+3cdb34db3269baf8006da35b9f82d9c9 urlgrabber-3.0.0.tar.gz
More information about the fedora-extras-commits
mailing list