[Pywebsvcs-checkins] SF.net SVN: pywebsvcs: [1316] trunk/zsi/ZSI/generate/commands.py

[<eo...@us...>]

Revision: 1316
          http://svn.sourceforge.net/pywebsvcs/?rev=1316&view=rev
Author:   eolson
Date:     2007-01-11 09:27:28 -0800 (Thu, 11 Jan 2007)

Log Message:
-----------
Fix import name conflict with "ServiceDescription" for wsdl2py and 
wsdl2dispatch.  Perhaps a more thorough naming fix is needed.
  This fixes a bug in the --simple-naming option's use of a 
separate messages file (and the import of it).

Modified Paths:
--------------
    trunk/zsi/ZSI/generate/commands.py

Modified: trunk/zsi/ZSI/generate/commands.py
===================================================================
--- trunk/zsi/ZSI/generate/commands.py	2007-01-05 22:14:35 UTC (rev 1315)
+++ trunk/zsi/ZSI/generate/commands.py	2007-01-11 17:27:28 UTC (rev 1316)
@@ -8,7 +8,7 @@
 from operator import xor
 import ZSI
 from ConfigParser import ConfigParser
-from ZSI.generate.wsdl2python import WriteServiceModule, ServiceDescription
+from ZSI.generate.wsdl2python import WriteServiceModule, ServiceDescription as wsdl2pyServiceDescription
 from ZSI.wstools import WSDLTools, XMLSchema
 from ZSI.wstools.logging import setBasicLoggerDEBUG
 from ZSI.generate import containers, utility
@@ -190,7 +190,7 @@
         # Use a different client suffix
         # WriteServiceModule.client_module_suffix = "_client"
         # Write messages definitions to a separate file.
-        ServiceDescription.separate_messages = True
+        wsdl2pyServiceDescription.separate_messages = True
         # Use more simple type and element class names
         containers.SetTypeNameFunc( lambda n: '%s_' %(NC_to_CN(n)) )
         containers.SetElementNameFunc( lambda n: '%s' %(NC_to_CN(n)) )


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