diff options
Diffstat (limited to 'silx/io/specfile.pyx')
| -rw-r--r-- | silx/io/specfile.pyx | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/silx/io/specfile.pyx b/silx/io/specfile.pyx index 38101b7..4e76c2c 100644 --- a/silx/io/specfile.pyx +++ b/silx/io/specfile.pyx @@ -118,7 +118,7 @@ _logger = logging.getLogger(__name__) cimport cython from libc.stdlib cimport free -cimport specfile_wrapper +cimport silx.io.specfile_wrapper as specfile_wrapper SF_ERR_NO_ERRORS = 0 @@ -655,12 +655,8 @@ cdef class SpecFile(object): def __init__(self, filename): if not isinstance(filename, str): - # encode unicode to str in python 2 - if sys.version_info[0] < 3: - self.filename = filename.encode() - # decode bytes to str in python 3 - elif sys.version_info[0] >= 3: - self.filename = filename.decode() + # decode bytes to str in python 3, str to unicode in python 2 + self.filename = filename.decode() else: self.filename = filename |