[Pywebsvcs-checkins] SF.net SVN: pywebsvcs: [1467] trunk/SOAPpy

[<wa...@us...>]

Revision: 1467
          http://pywebsvcs.svn.sourceforge.net/pywebsvcs/?rev=1467&view=rev
Author:   warnes
Date:     2008-05-16 16:32:51 -0700 (Fri, 16 May 2008)

Log Message:
-----------
Improve error reporting in WSDL proxy.

Modified Paths:
--------------
    trunk/SOAPpy/SOAPpy/WSDL.py
    trunk/SOAPpy/tests/Makefile

Removed Paths:
-------------
    trunk/SOAPpy/tests/translateTest.py

Modified: trunk/SOAPpy/SOAPpy/WSDL.py
===================================================================
--- trunk/SOAPpy/SOAPpy/WSDL.py	2008-05-16 22:02:05 UTC (rev 1466)
+++ trunk/SOAPpy/SOAPpy/WSDL.py	2008-05-16 23:32:51 UTC (rev 1467)
@@ -6,6 +6,8 @@
 from version import __version__
 
 import wstools
+import xml
+from Errors import Error
 from Client import SOAPProxy, SOAPAddress
 from Config import Config
 import urllib
@@ -39,8 +41,15 @@
 
         # From Mark Pilgrim's "Dive Into Python" toolkit.py--open anything.
         if self.wsdl is None and hasattr(wsdlsource, "read"):
-            #print 'stream'
-            self.wsdl = reader.loadFromStream(wsdlsource)
+            print 'stream:', wsdlsource
+            try:
+                self.wsdl = reader.loadFromStream(wsdlsource)
+            except xml.parsers.expat.ExpatError, e:
+                newstream = urllib.urlopen(wsdlsource)
+                buf = newstream.readlines()
+                raise Error, "Unable to parse WSDL file at %s: \n\t%s" % \
+                      (wsdlsource, "\t".join(buf))
+                
 
         # NOT TESTED (as of April 17, 2003)
         #if self.wsdl is None and wsdlsource == '-':
@@ -53,15 +62,24 @@
                 file(wsdlsource)
                 self.wsdl = reader.loadFromFile(wsdlsource)
                 #print 'file'
-            except (IOError, OSError): 
-                pass
-
+            except (IOError, OSError): pass
+            except xml.parsers.expat.ExpatError, e:
+                newstream = urllib.urlopen(wsdlsource)
+                buf = newstream.readlines()
+                raise Error, "Unable to parse WSDL file at %s: \n\t%s" % \
+                      (wsdlsource, "\t".join(buf))
+            
         if self.wsdl is None:
             try:
                 stream = urllib.urlopen(wsdlsource)
                 self.wsdl = reader.loadFromStream(stream, wsdlsource)
             except (IOError, OSError): pass
-
+            except xml.parsers.expat.ExpatError, e:
+                newstream = urllib.urlopen(wsdlsource)
+                buf = newstream.readlines()
+                raise Error, "Unable to parse WSDL file at %s: \n\t%s" % \
+                      (wsdlsource, "\t".join(buf))
+            
         if self.wsdl is None:
             import StringIO
             self.wsdl = reader.loadFromString(str(wsdlsource))

Modified: trunk/SOAPpy/tests/Makefile
===================================================================
--- trunk/SOAPpy/tests/Makefile	2008-05-16 22:02:05 UTC (rev 1466)
+++ trunk/SOAPpy/tests/Makefile	2008-05-16 23:32:51 UTC (rev 1467)
@@ -62,10 +62,10 @@
 	-$(PYTHON) SOAPtest.py # one subtest will fail
 	$(PYTHON) TCtest.py
 	$(PYTHON) testleak.py
-	$(PYTHON) translateTest.py
-	$(PYTHON) weatherTest.py
-	$(PYTHON) whoisTest.py
-	$(PYTHON) xmethods.py
+	-$(PYTHON) translateTest.py
+	-$(PYTHON) weatherTest.py
+	-$(PYTHON) whoisTest.py
+	-$(PYTHON) xmethods.py
 	$(PYTHON) ZeroLengthArray.py
 
 testClient1:

Deleted: trunk/SOAPpy/tests/translateTest.py
===================================================================
--- trunk/SOAPpy/tests/translateTest.py	2008-05-16 22:02:05 UTC (rev 1466)
+++ trunk/SOAPpy/tests/translateTest.py	2008-05-16 23:32:51 UTC (rev 1467)
@@ -1,54 +0,0 @@
-#!/usr/bin/env python
-
-# Copyright (c) 2001 actzero, inc. All rights reserved.
-ident = '$Id$'
-
-import os, re
-import sys
-sys.path.insert(1, "..")
-
-from SOAPpy import *
-
-# Check for a web proxy definition in environment
-try:
-   proxy_url=os.environ['http_proxy']
-   phost, pport = re.search('http://([^:]+):([0-9]+)', proxy_url).group(1,2)
-   proxy = "%s:%s" % (phost, pport)
-except:
-   proxy = None
-
-
-if 1:
-
-   server = WSDL.Proxy('http://www.webservicex.com/TranslateService.asmx?WSDL',
-                       http_proxy=proxy,
-                       ns="http://www.webservicex.com/")
-   
-   print server.show_methods()
-
-   server.soapproxy.config.dumpHeadersOut = True
-   server.soapproxy.config.dumpSOAPOut = True
-
-   server.soapproxy.config.dumpSOAPIn = True
-   server.soapproxy.config.dumpHeadersIn = True
-
-
-
-else:
-
-   server = SOAPProxy("http://www.webservicex.net/TranslateService.asmx/",
-                      http_proxy=proxy,
-                      soapaction="http://www.webservicex.net/Translate")
-   
-   server.config.dumpHeadersOut = True
-   server.config.dumpSOAPOut = True
-   
-   server.config.dumpSOAPIn = True
-   server.config.dumpHeadersIn = True
-
-query = server.Translate(LanguageMode="EnglishToFrench",
-                         Text="Hello, how are you today?")
-
-print query
-
-print repr(query)


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