Permalink
Browse files

Remove bytearrayobject.c from the build.

Addresses issue #163.
  • Loading branch information...
Andy Chu
Andy Chu committed Aug 19, 2018
1 parent b87cb5e commit 4fa0a807a98f63e1767cfeb7c1c7056e403eb0eb
@@ -2086,8 +2086,10 @@ _Py_ReadyTypes(void)
if (PyType_Ready(&PyString_Type) < 0)
Py_FatalError("Can't initialize str type");
#ifndef OVM_MAIN
if (PyType_Ready(&PyByteArray_Type) < 0)
Py_FatalError("Can't initialize bytearray type");
#endif
if (PyType_Ready(&PyList_Type) < 0)
Py_FatalError("Can't initialize list type");
@@ -1022,8 +1022,10 @@ string_concat(register PyStringObject *a, register PyObject *bb)
if (PyUnicode_Check(bb))
return PyUnicode_Concat((PyObject *)a, bb);
#endif
#ifndef OVM_MAIN
if (PyByteArray_Check(bb))
return PyByteArray_Concat((PyObject *)a, bb);
#endif
PyErr_Format(PyExc_TypeError,
"cannot concatenate 'str' and '%.200s' objects",
Py_TYPE(bb)->tp_name);
@@ -1529,12 +1529,14 @@ builtin_ord(PyObject *self, PyObject* obj)
ord = (long)((unsigned char)*PyString_AS_STRING(obj));
return PyInt_FromLong(ord);
}
#ifndef OVM_MAIN
} else if (PyByteArray_Check(obj)) {
size = PyByteArray_GET_SIZE(obj);
if (size == 1) {
ord = (long)((unsigned char)*PyByteArray_AS_STRING(obj));
return PyInt_FromLong(ord);
}
#endif
#ifdef Py_USING_UNICODE
} else if (PyUnicode_Check(obj)) {
@@ -2715,7 +2717,9 @@ _PyBuiltin_Init(void)
SETBUILTIN("basestring", &PyBaseString_Type);
SETBUILTIN("bool", &PyBool_Type);
SETBUILTIN("memoryview", &PyMemoryView_Type);
#ifndef OVM_MAIN
SETBUILTIN("bytearray", &PyByteArray_Type);
#endif
SETBUILTIN("bytes", &PyString_Type);
SETBUILTIN("buffer", &PyBuffer_Type);
SETBUILTIN("classmethod", &PyClassMethod_Type);
@@ -215,8 +215,10 @@ Py_InitializeEx(int install_sigs, char* sys_path)
if (!_PyLong_Init())
Py_FatalError("Py_Initialize: can't init longs");
#ifndef OVM_MAIN
if (!PyByteArray_Init())
Py_FatalError("Py_Initialize: can't init bytearray");
#endif
_PyFloat_Init();
@@ -534,7 +536,9 @@ Py_Finalize(void)
PyList_Fini();
PySet_Fini();
PyString_Fini();
#ifndef OVM_MAIN
PyByteArray_Fini();
#endif
PyInt_Fini();
PyFloat_Fini();
PyDict_Fini();
View
@@ -48,7 +48,6 @@ Objects/abstract.c
Objects/boolobject.c
Objects/bufferobject.c
Objects/bytes_methods.c
Objects/bytearrayobject.c
Objects/capsule.c
Objects/cellobject.c
Objects/classobject.c

0 comments on commit 4fa0a80

Please sign in to comment.