summaryrefslogtreecommitdiff
path: root/silx/utils/ExternalResources.py
diff options
context:
space:
mode:
authorAlexandre Marie <alexandre.marie@synchrotron-soleil.fr>2020-07-21 14:45:14 +0200
committerAlexandre Marie <alexandre.marie@synchrotron-soleil.fr>2020-07-21 14:45:14 +0200
commit328032e2317e3ac4859196bbf12bdb71795302fe (patch)
tree8cd13462beab109e3cb53410c42335b6d1e00ee6 /silx/utils/ExternalResources.py
parent33ed2a64c92b0311ae35456c016eb284e426afc2 (diff)
New upstream version 0.13.0+dfsg
Diffstat (limited to 'silx/utils/ExternalResources.py')
-rw-r--r--silx/utils/ExternalResources.py21
1 files changed, 10 insertions, 11 deletions
diff --git a/silx/utils/ExternalResources.py b/silx/utils/ExternalResources.py
index 7d9008b..e21381c 100644
--- a/silx/utils/ExternalResources.py
+++ b/silx/utils/ExternalResources.py
@@ -167,12 +167,11 @@ class ExternalResources(object):
if not os.path.isfile(fullfilename):
raise RuntimeError(
- "Could not automatically \
- download test images %s!\n \ If you are behind a firewall, \
- please set both environment variable http_proxy and https_proxy.\
- This even works under windows ! \n \
- Otherwise please try to download the images manually from \n%s/%s"
- % (filename, self.url_base, filename))
+ """Could not automatically download test images %s!
+ If you are behind a firewall, please set both environment variable http_proxy and https_proxy.
+ This even works under windows !
+ Otherwise please try to download the images manually from
+ %s/%s""" % (filename, self.url_base, filename))
if filename not in self.all_data:
self.all_data.add(filename)
@@ -263,11 +262,11 @@ class ExternalResources(object):
if not os.path.isfile(fullimagename_bz2):
self.getfile(bzip2name)
if not os.path.isfile(fullimagename_bz2):
- raise RuntimeError("Could not automatically \
- download test images %s!\n \ If you are behind a firewall, \
- please set the environment variable http_proxy.\n \
- Otherwise please try to download the images manually from \n \
- %s" % (self.url_base, filename))
+ raise RuntimeError(
+ """Could not automatically download test images %s!
+ If you are behind a firewall, please set the environment variable http_proxy.
+ Otherwise please try to download the images manually from
+ %s""" % (self.url_base, filename))
try:
import bz2