Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Loading imports was accidentally using open() instead of build() #3

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .project
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>suds</name>
<name>txsuds</name>
<comment></comment>
<projects>
</projects>
Expand Down
6 changes: 3 additions & 3 deletions .pydevproject
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
<pydev_project>
<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.6</pydev_property>
<pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
<path>/suds</path>
<path>/suds/suds</path>
<path>/suds/tests</path>
<path>/txsuds</path>
<path>/txsuds/suds</path>
<path>/txsuds/tests</path>
</pydev_pathproperty>
<pydev_pathproperty name="org.python.pydev.PROJECT_EXTERNAL_SOURCE_PATH">
</pydev_pathproperty>
Expand Down
6 changes: 3 additions & 3 deletions makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This program is free software; you can redistribute it and/or modify
# it under the terms of the (LGPL) GNU Lesser General Public License as
# published by the Free Software Foundation; either version 3 of the
# published by the Free Software Foundation; either version 3 of the
# License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
Expand Down Expand Up @@ -49,11 +49,11 @@ rdocs : docs
docs :
rm -rf doc
rm -f /tmp/$(DOCTAR)
epydoc -vo doc `find suds -name "*.py"`
epydoc -vo doc `find txsuds -name "*.py"`
tar czvf /tmp/$(DOCTAR) doc

pdf :
epydoc -vo doc --pdf `find suds -name \*.py`
epydoc -vo doc --pdf `find txsuds -name \*.py`
mv doc/api.pdf doc/sudsapi.pdf

clean :
Expand Down
4 changes: 2 additions & 2 deletions sdist
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash
# This program is free software; you can redistribute it and/or modify
# it under the terms of the (LGPL) GNU Lesser General Public License as
# published by the Free Software Foundation; either version 3 of the
# published by the Free Software Foundation; either version 3 of the
# License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
Expand All @@ -15,7 +15,7 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# written by: Jeff Ortel ( [email protected] )

product="suds"
product="txsuds"
version=`python -c "import $product; print $product.__version__"`

if [ $1 ]
Expand Down
9 changes: 4 additions & 5 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the (LGPL) GNU Lesser General Public License as
# published by the Free Software Foundation; either version 3 of the
# published by the Free Software Foundation; either version 3 of the
# License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
Expand All @@ -16,13 +16,12 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# written by: Jeff Ortel ( [email protected] )

import sys
import suds
import txsuds
from setuptools import setup, find_packages

setup(
name="suds",
version=suds.__version__,
name="txsuds",
version=txsuds.__version__,
description="Lightweight SOAP client",
author="Jeff Ortel",
author_email="[email protected]",
Expand Down
48 changes: 23 additions & 25 deletions tests/axis1.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This program is free software; you can redistribute it and/or modify
# it under the terms of the (LGPL) GNU Lesser General Public License as
# published by the Free Software Foundation; either version 3 of the
# published by the Free Software Foundation; either version 3 of the
# License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
Expand All @@ -21,15 +21,13 @@
import sys
sys.path.append('../')

import logging
import traceback as tb
import suds.metrics as metrics
from tests import *
from suds import WebFault
from suds.client import Client
from suds.sudsobject import Object
from suds.transport.https import HttpAuthenticated
from suds.plugin import *
from txsuds import WebFault
from txsuds.client import Client
from txsuds.sudsobject import Object
from txsuds.transport.https import HttpAuthenticated
from txsuds.plugin import *

errors = 0

Expand All @@ -43,34 +41,34 @@ class MyInitPlugin(InitPlugin):
def initialized(self, context):
print 'PLUGIN (init): initialized: ctx=%s' % context.__dict__


class MyDocumentPlugin(DocumentPlugin):

def loaded(self, context):
print 'PLUGIN (document): loaded: ctx=%s' % context.__dict__

def parsed(self, context):
print 'PLUGIN (document): parsed: ctx=%s' % context.__dict__


class MyMessagePlugin(MessagePlugin):

def marshalled(self, context):
print 'PLUGIN (message): marshalled: ctx=%s' % context.__dict__

def sending(self, context):
print 'PLUGIN (message): sending: ctx=%s' % context.__dict__

def received(self, context):
print 'PLUGIN (message): received: ctx=%s' % context.__dict__

def parsed(self, context):
print 'PLUGIN (message): parsed: ctx=%s' % context.__dict__

def unmarshalled(self, context):
print 'PLUGIN: (massage): unmarshalled: ctx=%s' % context.__dict__


myplugins = (
MyInitPlugin(),
MyDocumentPlugin(),
Expand All @@ -81,7 +79,7 @@ def unmarshalled(self, context):

def start(url):
global errors
print '\n________________________________________________________________\n'
print '\n________________________________________________________________\n'
print 'Test @ ( %s )\nerrors = %d\n' % (url, errors)

try:
Expand Down Expand Up @@ -137,7 +135,7 @@ def start(url):
print 'addPersion()'
result = client.service.addPerson(person)
print '\nreply(\n%s\n)\n' % str(result)

#
# Async
#
Expand All @@ -149,7 +147,7 @@ def start(url):
error.httpcode = '500'
client.options.nosend=False
# request.failed(error)

#
#
# create a new name object used to update the person
Expand Down Expand Up @@ -182,7 +180,7 @@ def start(url):
errors += 1
print e
tb.print_exc()

try:
url = 'http://localhost:8081/axis/services/basic-rpc-encoded?wsdl'
start(url)
Expand Down Expand Up @@ -245,7 +243,7 @@ def start(url):
errors += 1
print e
tb.print_exc()

try:
print "echo(' this is cool ')"
result = client.service.echo('this is cool')
Expand All @@ -261,7 +259,7 @@ def start(url):
errors += 1
print e
tb.print_exc()

try:
print 'hello()'
result = client.service.hello()
Expand Down Expand Up @@ -326,7 +324,7 @@ def start(url):
tb.print_exc()

try:
print 'testExceptions()'
print 'testExceptions()'
result = client.service.throwException()
print '\nreply( %s )\n' % tostr(result)
raise Exception('Fault expected and not raised')
Expand All @@ -353,5 +351,5 @@ def start(url):
errors += 1
print e
tb.print_exc()

print '\nFinished: errors=%d' % errors
23 changes: 15 additions & 8 deletions tests/axis2.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This program is free software; you can redistribute it and/or modify
# it under the terms of the (LGPL) GNU Lesser General Public License as
# published by the Free Software Foundation; either version 3 of the
# published by the Free Software Foundation; either version 3 of the
# License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
Expand All @@ -17,13 +17,11 @@
import sys
sys.path.append('../')

import logging
import traceback as tb
import suds.metrics as metrics
from tests import *
from suds import *
from suds.client import Client
from txsuds import *
from txsuds.client import Client
from datetime import datetime
from twisted.internet import defer

errors = 0

Expand All @@ -32,14 +30,23 @@
#logging.getLogger('suds.client').setLevel(logging.DEBUG)

url = 'http://localhost:8080/axis2/services/BasicService?wsdl'

print 'url=%s' % url

#
# create a service client using the wsdl.
#
client = Client(url)


@defer.inlineCallbacks
def connect():
yield client.connect()
print 'connecting...',
connect()
print 'connected'


#
# print the service (introspection)
#
Expand Down Expand Up @@ -200,7 +207,7 @@
print '\nreply( %s )\n' % tostr(result)
except Exception, e:
print e

#
# test faults
#
Expand Down
Loading