Changeset e7b1f5b for python

Timestamp:

09/28/18 12:53:22 (6 years ago)

Author:

Hal Finkel <hfinkel@…>

Branches:

master, pympi

Children:

0654f4c

Parents:

b060d3c (diff), be75350 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Hal Finkel <hfinkel@…> (09/28/18 12:53:22)

git-committer:

Hal Finkel <hfinkel@…> (09/28/18 12:53:22)

Message:

Merge branch 'master' of git.mcs.anl.gov:genericio

Conflicts:

GNUmakefile

File:

• python/genericio.py (modified) (4 diffs)

python/genericio.py

@@ -38 +38 @@
 # *****************************************************************************
 
+from __future__ import print_function
 import numpy as np
 import ctypes as ct
-import os
+import os,sys
 
 #Define where the library is and load it
@@ -72 +73 @@
 
 def gio_read(file_name,var_name):
+    if sys.version_info[0] == 3:
+        file_name = bytes(file_name,'ascii')
+        var_name = bytes(var_name,'ascii')
     var_size = libpygio.get_elem_num(file_name)
     var_type = libpygio.get_variable_type(file_name,var_name)
     field_count = libpygio.get_variable_field_count(file_name,var_name)
     if(var_type==10):
-        print "Variable not found"
+        print("Variable not found")
         return
     elif(var_type==9):
-        print "variable type not known (not int32/int64/float/double)"
+        print("variable type not known (not int32/int64/float/double)")
     elif(var_type==0):
         #float
@@ -102 +106 @@
 
 def gio_has_variable(file_name,var_name):
+    if sys.version_info[0] == 3:
+        file_name=bytes(file_name,'ascii')
+        var_name=bytes(var_name,'ascii')
     var_size = libpygio.get_elem_num(file_name)
     var_type = libpygio.get_variable_type(file_name,var_name)
@@ -107 +114 @@
 
 def gio_inspect(file_name):
+    if sys.version_info[0] == 3:
+        file_name=bytes(file_name,'ascii')
     libpygio.inspect_gio(file_name)