merge
authorGustavo J. A. M. Carneiro <gjc@inescporto.pt>
Sat Aug 23 22:36:43 2008 +0100 (17 months ago)
changeset 3564353c72fc49aa
parent 3562 e1ed56c3cb4a
parent 3563 cecda7126440
child 3565 9ec60d05c563
merge
bindings/python/wscript
     1.1 --- a/bindings/python/ns3modulegen.py	Sat Aug 23 21:52:44 2008 +0100
     1.2 +++ b/bindings/python/ns3modulegen.py	Sat Aug 23 22:36:43 2008 +0100
     1.3 @@ -36,6 +36,8 @@
     1.4          return True
     1.5  pybindgen.settings.error_handler = ErrorHandler()
     1.6  
     1.7 +pybindgen.settings.wrapper_registry = pybindgen.settings.StdMapWrapperRegistry
     1.8 +
     1.9  
    1.10  class MyMultiSectionFactory(MultiSectionFactory):
    1.11  
     2.1 --- a/utils/python-unit-tests.py	Sat Aug 23 21:52:44 2008 +0100
     2.2 +++ b/utils/python-unit-tests.py	Sat Aug 23 22:36:43 2008 +0100
     2.3 @@ -114,13 +114,7 @@
     2.4          c1 = csma.GetChannel()
     2.5          c2 = csma.GetChannel()
     2.6  
     2.7 -        ## FIXME: it is a PyBindGen bug that comparison via hash
     2.8 -        ## functions is required.  However it should be noted that
     2.9 -        ## hash(channel) here basically returns the self->obj pointer,
    2.10 -        ## so if hash(c1) == hash(c2) then we know for sure that c1
    2.11 -        ## and c2 are the same channel, even if with different python
    2.12 -        ## wrappers.
    2.13 -        self.assertEqual(hash(c1), hash(c2))
    2.14 +        self.assert_(c1 is c2)
    2.15  
    2.16  if __name__ == '__main__':
    2.17      unittest.main()