diff options
author | Marc Glisse <marc.glisse@inria.fr> | 2020-01-20 16:59:13 +0100 |
---|---|---|
committer | Marc Glisse <marc.glisse@inria.fr> | 2020-01-20 16:59:13 +0100 |
commit | 463043e08e9c8938af96d7220a6d5bb77fc064d8 (patch) | |
tree | 2b150676eeb8cfa2a0dc3f2a7a1344c1501f87b0 /src/python/gudhi/off_reader.pyx | |
parent | a7f3167ffb465bd6d1e3b9e40bc6f1c35daf87fc (diff) | |
parent | 653b8ff129a9676d1bc69ee5231cf12f9aadd7e9 (diff) |
Merge remote-tracking branch 'origin/master' into ext
Diffstat (limited to 'src/python/gudhi/off_reader.pyx')
-rw-r--r-- | src/python/gudhi/off_reader.pyx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/python/gudhi/off_reader.pyx b/src/python/gudhi/off_reader.pyx index 225e981c..a0d5bf25 100644 --- a/src/python/gudhi/off_reader.pyx +++ b/src/python/gudhi/off_reader.pyx @@ -1,8 +1,3 @@ -from cython cimport numeric -from libcpp.vector cimport vector -from libcpp.string cimport string -import os - # 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 @@ -12,6 +7,11 @@ import os # Modification(s): # - YYYY/MM Author: Description of the modification +from cython cimport numeric +from libcpp.vector cimport vector +from libcpp.string cimport string +import os + __author__ = "Vincent Rouvreau" __copyright__ = "Copyright (C) 2016 Inria" __license__ = "MIT" @@ -19,7 +19,7 @@ __license__ = "MIT" cdef extern from "Off_reader_interface.h" namespace "Gudhi": vector[vector[double]] read_points_from_OFF_file(string off_file) -def read_off(off_file=''): +def read_points_from_off_file(off_file=''): """Read points from OFF file. :param off_file: An OFF file style name. @@ -30,7 +30,7 @@ def read_off(off_file=''): """ if off_file: if os.path.isfile(off_file): - return read_points_from_OFF_file(str.encode(off_file)) + return read_points_from_OFF_file(off_file.encode('utf-8')) else: print("file " + off_file + " not found.") return [] |