Skip to content

Commit

Permalink
[lldb] Make PythonDataObjects work with Python 2
Browse files Browse the repository at this point in the history
I considered keeping this change strictly downstream. Since we still
have a bunch of places that check for Python 2, I figured it doesn't
harm to land it upstream and avoid the conflict when I eventually do
remove them (hopefully soon!).
  • Loading branch information
JDevlieghere committed Jan 25, 2022
1 parent 8b29b84 commit 16bff06
Showing 1 changed file with 5 additions and 1 deletion.
Expand Up @@ -70,7 +70,9 @@ Expected<std::string> python::As<std::string>(Expected<PythonObject> &&obj) {
}

static bool python_is_finalizing() {
#if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION < 7
#if PY_MAJOR_VERSION == 2
return false;
#elif PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION < 7
return _Py_Finalizing != nullptr;
#else
return _Py_IsFinalizing();
Expand Down Expand Up @@ -279,7 +281,9 @@ PythonObject PythonObject::GetAttributeValue(llvm::StringRef attr) const {
}

StructuredData::ObjectSP PythonObject::CreateStructuredObject() const {
#if PY_MAJOR_VERSION >= 3
assert(PyGILState_Check());
#endif
switch (GetObjectType()) {
case PyObjectType::Dictionary:
return PythonDictionary(PyRefType::Borrowed, m_py_obj)
Expand Down

0 comments on commit 16bff06

Please sign in to comment.