--- a/components/python/suds/Makefile Wed Sep 07 14:48:39 2016 -0700
+++ b/components/python/suds/Makefile Wed Sep 07 14:48:39 2016 -0700
@@ -20,24 +20,22 @@
#
#
-# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
#
+
include ../../../make-rules/shared-macros.mk
-COMPONENT_NAME= suds
-COMPONENT_VERSION= 0.4
+COMPONENT_NAME= suds-jurko
+COMPONENT_VERSION= 0.6
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
-COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
+COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.bz2
COMPONENT_ARCHIVE_HASH= \
- sha256:d5524ae523bb9e09c57bcdbd1efae2c287d20603688ea31f6020ed180a489af0
+ sha256:29edb72fd21e3044093d86f33c66cf847c5aaab26d64cb90e69e528ef014e57f
COMPONENT_ARCHIVE_URL= $(call pypi_url)
-COMPONENT_PROJECT_URL= https://fedorahosted.org/suds/
+COMPONENT_PROJECT_URL= https://bitbucket.org/jurko/suds
COMPONENT_BUGDB= python-mod/suds
-TPNO= 14503
-
-# Import/syntax issues: not Python 3 ready.
-PYTHON_VERSIONS= $(PYTHON2_VERSIONS)
+TPNO= 29452
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/setup.py.mk
@@ -45,16 +43,8 @@
ASLR_MODE = $(ASLR_NOT_APPLICABLE)
-# The setup_logging() routine is defined in .../suds-0.4/tests/__init__.py
-# This is called in .../suds-0.4/tests/builtin.py but is not found "as is"
-# unless the suds package is installed. So add a line to correctly import it.
-COMPONENT_PRE_TEST_ACTION = \
- $(GSED) -i -e \
- "/^setup/i from __init__ import setup_logging" \
- $(SOURCE_DIR)/tests/builtin.py
-
COMPONENT_TEST_DIR = $(SOURCE_DIR)/tests
-COMPONENT_TEST_ARGS = builtin.py
+COMPONENT_TEST_ARGS = test_suds.py
# common targets
build: $(BUILD_NO_ARCH)
@@ -63,5 +53,4 @@
test: $(TEST_NO_ARCH)
-system-test: $(SYSTEM_TESTS_NOT_IMPLEMENTED)
-
+system-test: $(SYSTEM_TESTS_NOT_IMPLEMENTED)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/suds/patches/test.patch Wed Sep 07 14:48:39 2016 -0700
@@ -0,0 +1,22 @@
+In-house patch that allows tests to pass with Python 3.x.
+
+--- suds-jurko-0.6/tests/test_suds.py.orig 2016-09-02 06:32:25.212848597 -0800
++++ suds-jurko-0.6/tests/test_suds.py 2016-09-02 06:33:29.463753721 -0800
+@@ -1921,7 +1921,7 @@ xmlns:soap="http://schemas.xmlsoap.org/w
+ assert binding_qname == ("dummy", "my-namespace")
+ assert binding.__class__ is suds.wsdl.Binding
+ assert len(binding.operations) == 1
+- operation = binding.operations.values()[0]
++ operation = list(binding.operations.values())[0]
+ input = operation.soap.input.body
+ output = operation.soap.output.body
+ assert len(input.parts) == 1
+@@ -2060,7 +2060,7 @@ def _element_node_xml(name, min=None, ma
+
+ def _first_from_dict(d):
+ """Returns the first name/value pair from a dictionary or None if empty."""
+- for x in d.items():
++ for x in list(d.items()):
+ return x[0], x[1]
+
+
--- a/components/python/suds/suds-PYVER.p5m Wed Sep 07 14:48:39 2016 -0700
+++ b/components/python/suds/suds-PYVER.p5m Wed Sep 07 14:48:39 2016 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
@@ -35,11 +35,9 @@
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=org.opensolaris.arc-caseid value=PSARC/2013/253
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-file path=usr/lib/python$(PYVER)/vendor-packages/suds-$(COMPONENT_VERSION)-py$(PYVER).egg-info/PKG-INFO
-file path=usr/lib/python$(PYVER)/vendor-packages/suds-$(COMPONENT_VERSION)-py$(PYVER).egg-info/SOURCES.txt
-file path=usr/lib/python$(PYVER)/vendor-packages/suds-$(COMPONENT_VERSION)-py$(PYVER).egg-info/dependency_links.txt
-file path=usr/lib/python$(PYVER)/vendor-packages/suds-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
+#
file path=usr/lib/python$(PYVER)/vendor-packages/suds/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/suds/argparser.py
file path=usr/lib/python$(PYVER)/vendor-packages/suds/bindings/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/suds/bindings/binding.py
file path=usr/lib/python$(PYVER)/vendor-packages/suds/bindings/document.py
@@ -84,6 +82,7 @@
file path=usr/lib/python$(PYVER)/vendor-packages/suds/umx/core.py
file path=usr/lib/python$(PYVER)/vendor-packages/suds/umx/encoded.py
file path=usr/lib/python$(PYVER)/vendor-packages/suds/umx/typed.py
+file path=usr/lib/python$(PYVER)/vendor-packages/suds/version.py
file path=usr/lib/python$(PYVER)/vendor-packages/suds/wsdl.py
file path=usr/lib/python$(PYVER)/vendor-packages/suds/wsse.py
file path=usr/lib/python$(PYVER)/vendor-packages/suds/xsd/__init__.py
@@ -94,7 +93,12 @@
file path=usr/lib/python$(PYVER)/vendor-packages/suds/xsd/sxbase.py
file path=usr/lib/python$(PYVER)/vendor-packages/suds/xsd/sxbasic.py
file path=usr/lib/python$(PYVER)/vendor-packages/suds/xsd/sxbuiltin.py
-license LICENSE license=LGPLv3
+file path=usr/lib/python$(PYVER)/vendor-packages/suds_jurko-$(COMPONENT_VERSION)-py$(PYVER).egg-info/PKG-INFO
+file path=usr/lib/python$(PYVER)/vendor-packages/suds_jurko-$(COMPONENT_VERSION)-py$(PYVER).egg-info/SOURCES.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/suds_jurko-$(COMPONENT_VERSION)-py$(PYVER).egg-info/dependency_links.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/suds_jurko-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
+#
+license LICENSE.txt license=LGPLv3
# force the rename with an optional dependency on the old name
depend type=optional fmri=library/python-2/suds-$(PYV)@0.4,5.12-5.12.0.0.0.41.0