jyapayne/llvmpy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve bytes/unicode distinction for reading modules from bitcode & assembly

Browse source
This commit is contained in:
Thomas Kluyver 2012-09-30 15:07:51 +01:00 • committed by Siu Kwan Lam
commit aba3e208d2
3 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
llvm/_core.cpp
View file

@ -163,7 +163,11 @@ _wLLVMGetModuleFromAssembly(PyObject *self, PyObject *args)
{ {
LLVMPY_TRY LLVMPY_TRY
const char * str; const char * str;
#if (PY_MAJOR_VERSION >= 3)
if ( !PyArg_ParseTuple(args, "y", &str) ){
#else
if ( !PyArg_ParseTuple(args, "s", &str) ){ if ( !PyArg_ParseTuple(args, "s", &str) ){
#endif
return NULL; return NULL;
} }

5
llvm/_util.py
View file

@ -101,3 +101,8 @@ def _isstring_choose():
isstring = _isstring_choose() isstring = _isstring_choose()
try:
unicode_type = unicode
except NameError: # Py3
unicode_type = str

10
llvm/core.py
View file

@ -351,7 +351,9 @@ class Module(llvm.Ownable, llvm.Cacheable):
a module represented in bitcode. a module represented in bitcode.
""" """
if _util.isstring(fileobj_or_str): if isinstance(fileobj_or_str, _util.unicode_type):
data = fileobj_or_str.encode('utf-8')
elif isinstance(fileobj_or_str, bytes):
data = fileobj_or_str data = fileobj_or_str
else: else:
data = fileobj_or_str.read() data = fileobj_or_str.read()
@ -373,10 +375,14 @@ class Module(llvm.Ownable, llvm.Cacheable):
a module represented in llvm-ir assembly. a module represented in llvm-ir assembly.
""" """
if _util.isstring(fileobj_or_str): if isinstance(fileobj_or_str, _util.unicode_type):
data = fileobj_or_str.encode('utf-8')
elif isinstance(fileobj_or_str, bytes):
data = fileobj_or_str data = fileobj_or_str
else: else:
data = fileobj_or_str.read() data = fileobj_or_str.read()
if isinstance(data, _util.unicode_type):
data = data.encode()
ret = _core.LLVMGetModuleFromAssembly(data) ret = _core.LLVMGetModuleFromAssembly(data)
if not ret: if not ret:
raise llvm.LLVMException("Unable to create module from assembly") raise llvm.LLVMException("Unable to create module from assembly")