diff options
| author | Picca Frédéric-Emmanuel <picca@synchrotron-soleil.fr> | 2019-05-28 08:16:16 +0200 |
|---|---|---|
| committer | Picca Frédéric-Emmanuel <picca@synchrotron-soleil.fr> | 2019-05-28 08:16:16 +0200 |
| commit | 7287b75301a53bae723579b145448d43304272af (patch) | |
| tree | df6d1a4595f3352a8c90ce9cba0e71ea0269e98b /silx/io/url.py | |
| parent | 3e5dcad207c1eadeb74fb53f524c3a94fbe19096 (diff) | |
| parent | a763e5d1b3921b3194f3d4e94ab9de3fbe08bbdd (diff) | |
Update upstream source from tag 'upstream/0.10.1+dfsg'
Update to upstream version '0.10.1+dfsg'
with Debian dir 6b2d4eeabb68177b2b91df4d7527306d5e19409d
Diffstat (limited to 'silx/io/url.py')
| -rw-r--r-- | silx/io/url.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/silx/io/url.py b/silx/io/url.py index ba62a81..df38c21 100644 --- a/silx/io/url.py +++ b/silx/io/url.py @@ -1,7 +1,7 @@ # coding: utf-8 # /*########################################################################## # -# Copyright (c) 2016-2017 European Synchrotron Radiation Facility +# Copyright (c) 2016-2018 European Synchrotron Radiation Facility # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -29,7 +29,8 @@ __license__ = "MIT" __date__ = "29/01/2018" import logging -from silx.third_party import six +import six + parse = six.moves.urllib.parse @@ -350,7 +351,7 @@ class DataUrl(object): return self.__data_path def data_slice(self): - """Returns the slicing applyed to the data. + """Returns the slicing applied to the data. It is a tuple containing numbers, slice or ellipses. |