Bas Couwenberg pushed to branch master at Debian GIS Project / pycsw
Commits: 36c37a12 by Bas Couwenberg at 2018-07-15T09:48:12+02:00 Refresh patches. - - - - - b5be7f87 by Bas Couwenberg at 2018-07-15T09:59:31+02:00 Add patch to fix SyntaxError with Python 3.7 by renaming 'async' property to 'asynchronous'. (closes: #903784) - - - - - 41386074 by Bas Couwenberg at 2018-07-15T10:00:06+02:00 Set distribution to unstable. - - - - - 6 changed files: - debian/changelog - debian/patches/0002-Remove-externally-linked-files.patch - debian/patches/0004-Use-xdg-open-instead-of-firefox-in-desktop-file.patch - debian/patches/0006-Don-t-include-external-references-to-images.patch - + debian/patches/python3.7-async.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +pycsw (2.2.0+dfsg-4) unstable; urgency=medium + + * Team upload. + * Refresh patches. + * Add patch to fix SyntaxError with Python 3.7 by + renaming 'async' property to 'asynchronous'. + (closes: #903784) + + -- Bas Couwenberg <[email protected]> Sun, 15 Jul 2018 09:59:41 +0200 + pycsw (2.2.0+dfsg-3) unstable; urgency=medium * Team upload. ===================================== debian/patches/0002-Remove-externally-linked-files.patch ===================================== --- a/debian/patches/0002-Remove-externally-linked-files.patch +++ b/debian/patches/0002-Remove-externally-linked-files.patch @@ -18,7 +18,7 @@ W3C and jquery <script type="text/javascript"> $(document).ready(function() { $('.xml').change(function() { -@@ -469,8 +469,6 @@ +@@ -829,8 +829,6 @@ </ul> <hr/> <footer> ===================================== debian/patches/0004-Use-xdg-open-instead-of-firefox-in-desktop-file.patch ===================================== --- a/debian/patches/0004-Use-xdg-open-instead-of-firefox-in-desktop-file.patch +++ b/debian/patches/0004-Use-xdg-open-instead-of-firefox-in-desktop-file.patch @@ -6,9 +6,9 @@ Subject: Use xdg-open instead of firefox in desktop file etc/pycsw.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---- pycsw.orig/etc/pycsw.desktop -+++ pycsw/etc/pycsw.desktop -@@ -3,7 +3,7 @@ +--- a/etc/pycsw.desktop ++++ b/etc/pycsw.desktop +@@ -3,7 +3,7 @@ Type=Application Encoding=UTF-8 Name=pycsw Comment=pycsw catalog server ===================================== debian/patches/0006-Don-t-include-external-references-to-images.patch ===================================== --- a/debian/patches/0006-Don-t-include-external-references-to-images.patch +++ b/debian/patches/0006-Don-t-include-external-references-to-images.patch @@ -6,8 +6,8 @@ Subject: Don't include external references to images docs/_templates/indexsidebar.html | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) ---- pycsw.orig/docs/_templates/indexsidebar.html -+++ pycsw/docs/_templates/indexsidebar.html +--- a/docs/_templates/indexsidebar.html ++++ b/docs/_templates/indexsidebar.html @@ -1,19 +1,19 @@ <p> - <a title="This product conforms to the OpenGIS Catalogue Service Implementation Specification [Catalogue Service for the Web], Revision 3.0.0. OGC, OGC®, and CERTIFIED OGC COMPLIANT are trademarks or registered trademarks of the Open Geospatial Consortium, Inc. in the United States and other countries." href="http://www.opengeospatial.org/resource/products/details/?pid=1374";><img alt="This product conforms to the OpenGIS Catalogue Service Implementation Specification [Catalogue Service for the Web], Revision 3.0.0. OGC, OGC®, and CERTIFIED OGC COMPLIANT are trademarks or registered trademarks of the Open Geospatial Consortium, Inc. in the United States and other countries." src="https://portal.opengeospatial.org/public_ogc/compliance/Certified_OGC_Compliant_Logo_Web.gif"; height="74"/></a> ===================================== debian/patches/python3.7-async.patch ===================================== --- /dev/null +++ b/debian/patches/python3.7-async.patch @@ -0,0 +1,66 @@ +Description: Rename 'async' property to fix SyntaxError with Python 3.7. +Author: Bas Couwenberg <[email protected]> +Bug-Debian: https://bugs.debian.org/903784 +Bug: https://github.com/geopython/pycsw/issues/570 +Forwarded: https://github.com/geopython/pycsw/pull/571 + +--- a/pycsw/ogc/csw/csw2.py ++++ b/pycsw/ogc/csw/csw2.py +@@ -1933,7 +1933,7 @@ class Csw2(object): + + node2.text = self.parent.request + +- if self.parent.async: ++ if self.parent.asynchronous: + etree.SubElement(node, util.nspath_eval('csw:RequestId', + self.parent.context.namespaces)).text = self.kvp['requestid'] + +--- a/pycsw/ogc/csw/csw3.py ++++ b/pycsw/ogc/csw/csw3.py +@@ -2010,7 +2010,7 @@ class Csw3(object): + + node2.text = self.parent.request + +- if self.parent.async: ++ if self.parent.asynchronous: + etree.SubElement(node, util.nspath_eval('csw30:RequestId', + self.parent.context.namespaces)).text = self.parent.kvp['requestid'] + +--- a/pycsw/server.py ++++ b/pycsw/server.py +@@ -75,7 +75,7 @@ class Csw(object): + self.kvp = {} + + self.mode = 'csw' +- self.async = False ++ self.asynchronous = False + self.soap = False + self.request = None + self.exception = False +@@ -539,7 +539,7 @@ class Csw(object): + if 'responsehandler' in self.kvp: + # set flag to process asynchronously + import threading +- self.async = True ++ self.asynchronous = True + request_id = self.kvp.get('requestid', None) + if request_id is None: + import uuid +@@ -552,7 +552,7 @@ class Csw(object): + elif self.kvp['request'] == 'GetDomain': + self.response = self.iface.getdomain() + elif self.kvp['request'] == 'GetRecords': +- if self.async: # process asynchronously ++ if self.asynchronous: # process asynchronously + threading.Thread(target=self.iface.getrecords).start() + self.response = self.iface._write_acknowledgement() + else: +@@ -564,7 +564,7 @@ class Csw(object): + elif self.kvp['request'] == 'Transaction': + self.response = self.iface.transaction() + elif self.kvp['request'] == 'Harvest': +- if self.async: # process asynchronously ++ if self.asynchronous: # process asynchronously + threading.Thread(target=self.iface.harvest).start() + self.response = self.iface._write_acknowledgement() + else: ===================================== debian/patches/series ===================================== --- a/debian/patches/series +++ b/debian/patches/series @@ -3,3 +3,4 @@ 0004-Use-xdg-open-instead-of-firefox-in-desktop-file.patch 0006-Don-t-include-external-references-to-images.patch 0007-python-six-dependency.patch +python3.7-async.patch View it on GitLab: https://salsa.debian.org/debian-gis-team/pycsw/compare/4b4685753ed253aeb7d41746b1a72410d7a84f8f...413860745b4d9438568d2f250343267d6c9c4442 -- View it on GitLab: https://salsa.debian.org/debian-gis-team/pycsw/compare/4b4685753ed253aeb7d41746b1a72410d7a84f8f...413860745b4d9438568d2f250343267d6c9c4442 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ Pkg-grass-devel mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-grass-devel
![https://portal.opengeospatial.org/public_ogc/compliance/Certified_OGC_Compliant_Logo_Web.gif"](https://portal.opengeospatial.org/public_ogc/compliance/Certified_OGC_Compliant_Logo_Web.gif"){kind=link}