Merge remote-tracking branch 'origin/master' into doc

1 files changed, 13 insertions, 13 deletions

diff --git a/src/python/gudhi/reader_utils.pyx b/src/python/gudhi/reader_utils.pyx
index 9ced6bca..fe1c3a2e 100644
--- a/src/python/gudhi/reader_utils.pyx
+++ b/src/python/gudhi/reader_utils.pyx
@@ -1,12 +1,3 @@
-from cython cimport numeric
-from libcpp.vector cimport vector
-from libcpp.string cimport string
-from libcpp.map cimport map
-from libcpp.pair cimport pair
-
-from os import path
-from numpy import array as np_array
-
 # This file is part of the Gudhi Library - https://gudhi.inria.fr/ - which is released under MIT.
 # See file LICENSE or go to https://gudhi.inria.fr/licensing/ for full license details.
 # Author(s):       Vincent Rouvreau
@@ -16,6 +7,15 @@ from numpy import array as np_array
 # Modification(s):
 #   - YYYY/MM Author: Description of the modification
 
+from cython cimport numeric
+from libcpp.vector cimport vector
+from libcpp.string cimport string
+from libcpp.map cimport map
+from libcpp.pair cimport pair
+
+from os import path
+from numpy import array as np_array
+
 __author__ = "Vincent Rouvreau"
 __copyright__ = "Copyright (C) 2017 Inria"
 __license__ = "MIT"
@@ -38,7 +38,7 @@ def read_lower_triangular_matrix_from_csv_file(csv_file='', separator=';'):
     """
     if csv_file:
         if path.isfile(csv_file):
-            return read_matrix_from_csv_file(str.encode(csv_file), ord(separator[0]))
+            return read_matrix_from_csv_file(csv_file.encode('utf-8'), ord(separator[0]))
     print("file " + csv_file + " not set or not found.")
     return []
 
@@ -57,7 +57,7 @@ def read_persistence_intervals_grouped_by_dimension(persistence_file=''):
     """
     if persistence_file:
         if path.isfile(persistence_file):
-            return read_pers_intervals_grouped_by_dimension(str.encode(persistence_file))
+            return read_pers_intervals_grouped_by_dimension(persistence_file.encode('utf-8'))
     print("file " + persistence_file + " not set or not found.")
     return []
 
@@ -80,7 +80,7 @@ def read_persistence_intervals_in_dimension(persistence_file='', only_this_dim=-
     """
     if persistence_file:
         if path.isfile(persistence_file):
-            return np_array(read_pers_intervals_in_dimension(str.encode(
-                persistence_file), only_this_dim))
+            return np_array(read_pers_intervals_in_dimension(persistence_file.encode(
+                'utf-8'), only_this_dim))
     print("file " + persistence_file + " not set or not found.")
     return []