From b9722796d773af4e3bc529be701d6002cd56c93d Mon Sep 17 00:00:00 2001 From: "Gustavo J. A. M. Carneiro" Date: Tue, 22 Jul 2008 16:54:24 +0100 Subject: [PATCH] Require new PyBindGen; make it work for Python 2.3. --- bindings/python/ns3modulegen.py | 2 +- bindings/python/ns3modulegen_core_customizations.py | 2 +- bindings/python/wscript | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bindings/python/ns3modulegen.py b/bindings/python/ns3modulegen.py index d986e9565..7d3ab611a 100644 --- a/bindings/python/ns3modulegen.py +++ b/bindings/python/ns3modulegen.py @@ -12,7 +12,7 @@ from pybindgen import FileCodeSink, write_preamble from pybindgen.module import MultiSectionFactory import pybindgen.settings -from ns3modulegen_generated import (module_init, register_types, register_methods, register_functions) +from ns3modulegen_generated import module_init, register_types, register_methods, register_functions import ns3modulegen_core_customizations import callbacks_list diff --git a/bindings/python/ns3modulegen_core_customizations.py b/bindings/python/ns3modulegen_core_customizations.py index 50e6dc849..29a73206f 100644 --- a/bindings/python/ns3modulegen_core_customizations.py +++ b/bindings/python/ns3modulegen_core_customizations.py @@ -1,7 +1,7 @@ import re from pybindgen.typehandlers import base as typehandlers -from pybindgen import (ReturnValue, Parameter) +from pybindgen import ReturnValue, Parameter from pybindgen.cppmethod import CustomCppMethodWrapper, CustomCppConstructorWrapper from pybindgen.typehandlers.codesink import MemoryCodeSink from pybindgen.typehandlers import ctypeparser diff --git a/bindings/python/wscript b/bindings/python/wscript index 03766fa24..701123fae 100644 --- a/bindings/python/wscript +++ b/bindings/python/wscript @@ -21,7 +21,7 @@ else: os.environ['PYTHONPATH'] = LOCAL_PYBINDGEN_PATH ## https://launchpad.net/pybindgen/ -REQUIRED_PYBINDGEN_VERSION = (0, 8, 0, 511) +REQUIRED_PYBINDGEN_VERSION = (0, 8, 0, 515) REQUIRED_PYGCCXML_VERSION = (0, 9, 5) @@ -93,7 +93,7 @@ def configure(conf): ## Check for Python try: conf.check_tool('python') - conf.check_python_version((2,4,2)) + conf.check_python_version((2,3)) conf.check_python_headers() except Configure.ConfigurationError: return