[Pywebsvcs-checkins] SF.net SVN: pywebsvcs: [1343] trunk/zsi

[<bov...@us...>]

Revision: 1343
          http://svn.sourceforge.net/pywebsvcs/?rev=1343&view=rev
Author:   boverhof
Date:     2007-01-26 11:17:13 -0800 (Fri, 26 Jan 2007)

Log Message:
-----------
M    test/wsdl2py/test_Choice.py
M    test/wsdl2py/config.txt
M    test/wsdl2py/test_GoogleAdWords.py
M    ZSI/generate/commands.py
M    ZSI/TCtimes.py

-- found little problem with formatting TCtimes typecodes, added Choice/DerivedTypes/Attributes into default test suite

Modified Paths:
--------------
    trunk/zsi/ZSI/TCtimes.py
    trunk/zsi/ZSI/generate/commands.py
    trunk/zsi/test/wsdl2py/config.txt
    trunk/zsi/test/wsdl2py/test_Choice.py
    trunk/zsi/test/wsdl2py/test_GoogleAdWords.py

Modified: trunk/zsi/ZSI/TCtimes.py
===================================================================
--- trunk/zsi/ZSI/TCtimes.py	2007-01-26 18:40:46 UTC (rev 1342)
+++ trunk/zsi/ZSI/TCtimes.py	2007-01-26 19:17:13 UTC (rev 1343)
@@ -221,7 +221,7 @@
             d['neg'] = ''
 
         ms = pyobj[6]
-        if not ms: 
+        if not ms or not hasattr(self, 'format_ms'): 
             d = { 'Y': pyobj[0], 'M': pyobj[1], 'D': pyobj[2],
                 'h': pyobj[3], 'm': pyobj[4], 's': pyobj[5], }
             return self.format % d

Modified: trunk/zsi/ZSI/generate/commands.py
===================================================================
--- trunk/zsi/ZSI/generate/commands.py	2007-01-26 18:40:46 UTC (rev 1342)
+++ trunk/zsi/ZSI/generate/commands.py	2007-01-26 19:17:13 UTC (rev 1343)
@@ -175,7 +175,12 @@
         # exit code UNIX specific, Windows?
         if hasattr(os, 'EX_NOINPUT'): sys.exit(os.EX_NOINPUT)
         sys.exit("error loading %s" %location)
-    
+  
+    if isinstance(wsdl, XMLSchema.XMLSchema): 
+        wsdl.location = location
+        _wsdl2py(options, wsdl)
+        return
+
     _wsdl2py(options, wsdl)
     _wsdl2dispatch(options, wsdl)
     

Modified: trunk/zsi/test/wsdl2py/config.txt
===================================================================
--- trunk/zsi/test/wsdl2py/config.txt	2007-01-26 18:40:46 UTC (rev 1342)
+++ trunk/zsi/test/wsdl2py/config.txt	2007-01-26 19:17:13 UTC (rev 1343)
@@ -118,7 +118,7 @@
 document = True
 literal = True
 broke = False
-tests =  test_MapPoint test_Echo test_AWSECommerceService test_FinancialService test_BasicComm test_Manufacturer test_Racing 
+tests =  test_MapPoint test_Echo test_AWSECommerceService test_FinancialService test_BasicComm test_Manufacturer test_Racing  test_Attributes test_Choice test_DerivedTypes
 
 [doc_literal_broke]
 document = True

Modified: trunk/zsi/test/wsdl2py/test_Choice.py
===================================================================
--- trunk/zsi/test/wsdl2py/test_Choice.py	2007-01-26 18:40:46 UTC (rev 1342)
+++ trunk/zsi/test/wsdl2py/test_Choice.py	2007-01-26 19:17:13 UTC (rev 1343)
@@ -64,12 +64,9 @@
         """<choice minOccurs=1 maxOccurs=unbounded>
         """
         pyobj = GED("urn:example", "Hard").pyclass()
-        pyobj.Name = "steve"
-        pyobj.Name.append("mark")
-        pyobj.Any = "whatever"
-        pyobj.Rank = 2
-        pyobj.Rank.append(3)
-        pyobj.Rank.append(4)
+        pyobj.Name = ["steve", "mark"]
+        pyobj.Any = ["whatever"]
+        pyobj.Rank = [2,3,4]
         sw = SoapWriter()
         sw.serialize(pyobj)
         print str(sw)

Modified: trunk/zsi/test/wsdl2py/test_GoogleAdWords.py
===================================================================
--- trunk/zsi/test/wsdl2py/test_GoogleAdWords.py	2007-01-26 18:40:46 UTC (rev 1342)
+++ trunk/zsi/test/wsdl2py/test_GoogleAdWords.py	2007-01-26 19:17:13 UTC (rev 1343)
@@ -42,14 +42,14 @@
     """Test case for Google AdWords, sandbox v8
     Reads header information from a file "adwords.properties", need to format this for ConfigParser
 
-[test_GoogleAdWords_TES]
+[test_GoogleAdWords]
 email = 
 password = 
 useragent = 
 applicationtoken = 
 
     """
-    name = "test_GoogleAdWords_TES"
+    name = "test_GoogleAdWords"
     client_file_name = "TrafficEstimatorService_client.py"
     types_file_name = "TrafficEstimatorService_types.py"
     server_file_name = "TrafficEstimatorService_server.py"


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