From 431647502d897049cdafd51510d6a209184cc51c Mon Sep 17 00:00:00 2001 From: recht Date: Wed, 24 Dec 2003 11:44:08 +0000 Subject: update to 0.53 and patched to work with the current SOAPpy the only change in this releas: - fixed small typo in documentation --- net/py-google/Makefile | 7 +++---- net/py-google/distinfo | 8 ++++---- net/py-google/patches/patch-aa | 28 +++++++++++++++++++++------- 3 files changed, 28 insertions(+), 15 deletions(-) (limited to 'net') diff --git a/net/py-google/Makefile b/net/py-google/Makefile index 854b2f1e758..f4e566c3b54 100644 --- a/net/py-google/Makefile +++ b/net/py-google/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.10 2003/09/21 18:11:22 jmc Exp $ +# $NetBSD: Makefile,v 1.11 2003/12/24 11:44:08 recht Exp $ # -DISTNAME= pygoogle-0.5.2 -PKGNAME= ${PYPKGPREFIX}-google-0.5.2 -PKGREVISION= 2 +DISTNAME= pygoogle-0.5.3 +PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//} WRKSRC= ${WRKDIR}/pygoogle CATEGORIES= net MASTER_SITES= http://diveintomark.org/projects/pygoogle/ diff --git a/net/py-google/distinfo b/net/py-google/distinfo index 90de1b1c3ee..ace2d39da76 100644 --- a/net/py-google/distinfo +++ b/net/py-google/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.3 2003/08/11 22:08:33 recht Exp $ +$NetBSD: distinfo,v 1.4 2003/12/24 11:44:08 recht Exp $ -SHA1 (pygoogle-0.5.2.zip) = c152a68759ad97f39e8cab6c71c0e1e2fb9f1103 -Size (pygoogle-0.5.2.zip) = 35828 bytes -SHA1 (patch-aa) = f3f874f4bf8b6f7da16f99bfec6da4575188b72c +SHA1 (pygoogle-0.5.3.zip) = 6b4e6c3541bc7c0025c889cc4eca2e8bb7c4a041 +Size (pygoogle-0.5.3.zip) = 35862 bytes +SHA1 (patch-aa) = b5fbf5df67b3e61e9391cb2f1e5b9b6003f9a007 SHA1 (patch-ab) = 1c9074efff6444cfd05597534fb57308b07e746e SHA1 (patch-ac) = 0938d8035a2371870c31e0eff0104ad3d38f4b62 SHA1 (patch-ad) = a95eab548482244e31e5199e8e8991ac828275d9 diff --git a/net/py-google/patches/patch-aa b/net/py-google/patches/patch-aa index a2b1ddca827..7ea01c1c47f 100644 --- a/net/py-google/patches/patch-aa +++ b/net/py-google/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.2 2003/08/11 22:08:34 recht Exp $ +$NetBSD: patch-aa,v 1.3 2003/12/24 11:44:08 recht Exp $ ---- google.py.orig 2002-04-18 22:11:18.000000000 +0200 -+++ google.py 2003-05-31 12:17:35.000000000 +0200 +--- google.py.orig 2003-06-18 11:17:06.000000000 +0200 ++++ google.py 2003-12-24 12:38:27.000000000 +0100 @@ -43,7 +43,8 @@ Erik Max Francis, for the command line interface Michael Twomey, for HTTP proxy support""" @@ -23,20 +23,23 @@ $NetBSD: patch-aa,v 1.2 2003/08/11 22:08:34 recht Exp $ _googlefile1 = ".googlekey" _googlefile2 = "googlekey.txt" _licenseLocations = ( -@@ -201,10 +202,10 @@ +@@ -201,11 +202,11 @@ class _SearchBase: def __init__(self, params): for k, v in params.items(): - if isinstance(v, SOAP.structType): +- v = v._asdict + if isinstance(v, Types.structType): - v = v._asdict ++ v = v._asdict() try: - if isinstance(v[0], SOAP.structType): +- v = [node._asdict for node in v] + if isinstance(v[0], Types.structType): - v = [node._asdict for node in v] ++ v = [node._asdict() for node in v] except: pass -@@ -303,7 +304,7 @@ + self.__dict__[str(k)] = v +@@ -303,16 +304,16 @@ See documentation of these individual classes for list of available attributes """ http_proxy = getProxy(http_proxy) @@ -45,6 +48,17 @@ $NetBSD: patch-aa,v 1.2 2003/08/11 22:08:34 recht Exp $ license_key = getLicense(license_key) filter = _marshalBoolean(filter) safeSearch = _marshalBoolean(safeSearch) + data = remoteserver.doGoogleSearch(license_key, q, start, maxResults, filter, restrict, + safeSearch, language, inputencoding, outputencoding) +- metadata = data._asdict ++ metadata = data._asdict() + del metadata["resultElements"] + metadata = SearchResultsMetaData(metadata) +- results = [SearchResult(node._asdict) for node in data.resultElements] ++ results = [SearchResult(node._asdict()) for node in data.resultElements] + return SearchReturnValue(metadata, results) + + def doGetCachedPage(url, license_key = None, http_proxy = None): @@ -330,7 +331,7 @@ Returns: string, text of cached page """ -- cgit v1.2.3