Merge pull request #730 from RemiDesgrange/fix-timeout

Add timeout to get capabilities
geopython · Jan 18, 2021 · b70db59 · b70db59
2 parents b0bf07f + 85fbff7
commit b70db59
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 11 deletions.
diff --git a/owslib/coverage/wcs100.py b/owslib/coverage/wcs100.py
@@ -38,17 +38,18 @@ def __getitem__(self, name):
         else:
             raise KeyError("No content named %s" % name)
 
-    def __init__(self, url, xml, cookies, auth=None):
+    def __init__(self, url, xml, cookies, auth=None, timeout=30):
         super(WebCoverageService_1_0_0, self).__init__(auth)
         self.version = '1.0.0'
         self.url = url
         self.cookies = cookies
+        self.timeout = timeout
         # initialize from saved capability document or access the server
         reader = WCSCapabilitiesReader(self.version, self.cookies, self.auth)
         if xml:
             self._capabilities = reader.readString(xml)
         else:
-            self._capabilities = reader.read(self.url)
+            self._capabilities = reader.read(self.url, self.timeout)
 
         # check for exceptions
         se = self._capabilities.find('ServiceException')

diff --git a/owslib/coverage/wcs110.py b/owslib/coverage/wcs110.py
@@ -51,7 +51,7 @@ def __getitem__(self, name):
         else:
             raise KeyError("No content named %s" % name)
 
-    def __init__(self, url, xml, cookies, auth=None):
+    def __init__(self, url, xml, cookies, auth=None, timeout=30):
         super(WebCoverageService_1_1_0, self).__init__(auth=auth)
 
         self.url = url
@@ -61,7 +61,7 @@ def __init__(self, url, xml, cookies, auth=None):
         if xml:
             self._capabilities = reader.readString(xml)
         else:
-            self._capabilities = reader.read(self.url)
+            self._capabilities = reader.read(self.url, self.timeout)
 
         # check for exceptions
         se = self._capabilities.find(self.ns.OWS('Exception'))

diff --git a/owslib/coverage/wcs200.py b/owslib/coverage/wcs200.py
@@ -53,7 +53,7 @@ def __getitem__(self, name):
         else:
             raise KeyError("No content named %s" % name)
 
-    def __init__(self, url, xml, cookies, auth=None):
+    def __init__(self, url, xml, cookies, auth=None, timeout=30):
         super(WebCoverageService_2_0_0, self).__init__(auth=auth)
         self.version = "2.0.0"
         self.url = url
@@ -64,7 +64,7 @@ def __init__(self, url, xml, cookies, auth=None):
         if xml:
             self._capabilities = reader.readString(xml)
         else:
-            self._capabilities = reader.read(self.url)
+            self._capabilities = reader.read(self.url, self.timeout)
 
         # check for exceptions
         se = self._capabilities.find("ServiceException")

diff --git a/owslib/coverage/wcs201.py b/owslib/coverage/wcs201.py
@@ -53,7 +53,7 @@ def __getitem__(self, name):
         else:
             raise KeyError("No content named %s" % name)
 
-    def __init__(self, url, xml, cookies, auth=None):
+    def __init__(self, url, xml, cookies, auth=None, timeout=30):
         super(WebCoverageService_2_0_1, self).__init__(auth=auth)
         self.version = "2.0.1"
         self.url = url
@@ -64,7 +64,7 @@ def __init__(self, url, xml, cookies, auth=None):
         if xml:
             self._capabilities = reader.readString(xml)
         else:
-            self._capabilities = reader.read(self.url)
+            self._capabilities = reader.read(self.url, self.timeout)
 
         # check for exceptions
         se = self._capabilities.find("ServiceException")

diff --git a/owslib/feature/wfs100.py b/owslib/feature/wfs100.py
@@ -140,7 +140,7 @@ def __init__(
         if xml:
             self._capabilities = reader.readString(xml)
         else:
-            self._capabilities = reader.read(self.url)
+            self._capabilities = reader.read(self.url, self.timeout)
         self._buildMetadata(parse_remote_metadata)
 
     def _buildMetadata(self, parse_remote_metadata=False):

diff --git a/owslib/feature/wfs110.py b/owslib/feature/wfs110.py
@@ -132,7 +132,7 @@ def __init__(
         if xml:
             self._capabilities = reader.readString(xml)
         else:
-            self._capabilities = reader.read(self.url)
+            self._capabilities = reader.read(self.url, self.timeout)
         self._buildMetadata(parse_remote_metadata)
 
     def _buildMetadata(self, parse_remote_metadata=False):

diff --git a/owslib/feature/wfs200.py b/owslib/feature/wfs200.py
@@ -125,7 +125,7 @@ def __init__(
         if xml:
             self._capabilities = reader.readString(xml)
         else:
-            self._capabilities = reader.read(self.url)
+            self._capabilities = reader.read(self.url, self.timeout)
         self._buildMetadata(parse_remote_metadata)
 
     def _buildMetadata(self, parse_remote_metadata=False):