[Swig-cvs] SF.net SVN: swig:[12594] branches/szager-python-builtin/Source/Modules/ python.cxx

[<sz...@us...>]

Revision: 12594
          http://swig.svn.sourceforge.net/swig/?rev=12594&view=rev
Author:   szager
Date:     2011-04-03 05:15:48 +0000 (Sun, 03 Apr 2011)

Log Message:
-----------
Merged %pythonnondynamic fix

Modified Paths:
--------------
    branches/szager-python-builtin/Source/Modules/python.cxx

Property Changed:
----------------
    branches/szager-python-builtin/Source/Modules/python.cxx

Modified: branches/szager-python-builtin/Source/Modules/python.cxx
===================================================================
--- branches/szager-python-builtin/Source/Modules/python.cxx	2011-04-03 05:13:06 UTC (rev 12593)
+++ branches/szager-python-builtin/Source/Modules/python.cxx	2011-04-03 05:15:48 UTC (rev 12594)
@@ -858,9 +858,9 @@
 #endif
 	       tab4, tab8, "return\n", tab4, "method = class_type.__swig_setmethods__.get(name,None)\n", tab4, "if method: return method(self,value)\n",
 #ifdef USE_THISOWN
-	       tab4, "if (not static) or hasattr(self,name) or (name == \"thisown\"):\n",
+	       tab4, "if (not static) or (name == \"thisown\"):\n",
 #else
-	       tab4, "if (not static) or hasattr(self,name):\n",
+	       tab4, "if (not static):\n",
 #endif
 	       tab4, tab4, "self.__dict__[name] = value\n",
 	       tab4, "else:\n",


Property changes on: branches/szager-python-builtin/Source/Modules/python.cxx
___________________________________________________________________
Added: svn:mergeinfo
   + /branches/swig-2.0/Source/Modules/python.cxx:11085-11086,11088-11089
/trunk/Source/Modules/python.cxx:12332-12551,12593


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.