Subject: [Boost-commit] svn:boost r52134 - sandbox-branches/bhy/py3k/libs/python/src/object
From: divinekid_at_[hidden]
Date: 2009-04-02 13:04:26
Author: bhy
Date: 2009-04-02 13:04:26 EDT (Thu, 02 Apr 2009)
New Revision: 52134
URL: http://svn.boost.org/trac/boost/changeset/52134
Log:
Fix more bugs due to typo.
Text files modified:
sandbox-branches/bhy/py3k/libs/python/src/object/enum.cpp | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
Modified: sandbox-branches/bhy/py3k/libs/python/src/object/enum.cpp
==============================================================================
--- sandbox-branches/bhy/py3k/libs/python/src/object/enum.cpp (original)
+++ sandbox-branches/bhy/py3k/libs/python/src/object/enum.cpp 2009-04-02 13:04:26 EDT (Thu, 02 Apr 2009)
@@ -46,7 +46,7 @@
#if PY_VERSION_HEX >= 0x03000000
PyUnicode_FromFormat("%S.%s(%ld)", mod, self_->ob_type->tp_name, PyLong_AsLong(self_));
#else
- PyString_FromFormat("%S.%s(%ld)", mod, self_->ob_type->tp_name, PyInt_AS_LONG(self_));
+ PyString_FromFormat("%s.%s(%ld)", PyString_AsString(mod), self_->ob_type->tp_name, PyInt_AS_LONG(self_));
#endif
}
else
@@ -58,11 +58,11 @@
return
#if PY_VERSION_HEX >= 0x03000000
- PyUnicode_FromFormat
+ PyUnicode_FromFormat("%S.%s.%S", mod, self_->ob_type->tp_name, name);
#else
- PyString_FromFormat
+ PyString_FromFormat("%s.%s.%s",
+ PyString_AsString(mod), self_->ob_type->tp_name, PyString_AsString(name));
#endif
- ("%S.%s.%S", mod, self_->ob_type->tp_name, name);
}
}
@@ -105,7 +105,7 @@
0, /* tp_setattro */
0, /* tp_as_buffer */
Py_TPFLAGS_DEFAULT
-#if PY_VERSION_HEX <= 0x03000000
+#if PY_VERSION_HEX < 0x03000000
| Py_TPFLAGS_CHECKTYPES
#endif
| Py_TPFLAGS_HAVE_GC
@@ -149,7 +149,7 @@
if (enum_type_object.tp_dict == 0)
{
Py_TYPE(&enum_type_object) = incref(&PyType_Type);
-#if PY_VERSION_HEX >= 0x02060000
+#if PY_VERSION_HEX >= 0x03000000
enum_type_object.tp_base = &PyLong_Type;
#else
enum_type_object.tp_base = &PyInt_Type;