Replace suds.__init__.properties with __version__ and __build__ and f…

…ix client.py, specfile and setup.py to match. The name (properties) was in conflict with the new properties.py module. Fixed various epydocs.

sdist

@@ -16,7 +16,7 @@
 # written by: Jeff Ortel ( jortel@redhat.com )
 
 product="suds"
-version=`python -c "import $product; print $product.properties['version']"`
+version=`python -c "import $product; print $product.__version__"`
 
 if [ $1 ]
 then

setup.py

@@ -17,12 +17,12 @@
 # written by: Jeff Ortel ( jortel@redhat.com )
 
 import sys
+import suds
 from setuptools import setup, find_packages
-from suds import properties
 
 setup(
     name="suds",
-    version=properties['version'],
+    version=suds.__version__,
     description="Lightweight SOAP client",
     author="Jeff Ortel",
     author_email="jortel@redhat.com",

suds/__init__.py

@@ -30,8 +30,7 @@
 #
 
 __version__ = '0.3.7'
-
-properties = dict(version=__version__, build="(beta) R573-20091029")
+__build__="(beta) R575-20091030"
 
 #
 # Exceptions

suds/client.py

@@ -19,7 +19,7 @@
 See I{README.txt}
 """
 
-from logging import getLogger
+import suds
 import suds.metrics as metrics
 from cookielib import CookieJar
 from suds import *
@@ -39,6 +39,7 @@
 from suds.properties import Unskin
 from urlparse import urlparse
 from copy import deepcopy
+from logging import getLogger
 
 log = getLogger(__name__)
 
@@ -183,10 +184,9 @@ def __str__(self):
 
     def __unicode__(self):
         s = ['\n']
-        version = properties.get('version')
-        build = properties.get('build').split()
+        build = suds.__build__.split()
         s.append('Suds ( https://fedorahosted.org/suds/ )')
-        s.append('  version: %s' % version)
+        s.append('  version: %s' % suds.__version__)
         s.append(' %s  build: %s' % (build[0], build[1]))
         for sd in self.sd:
             s.append('\n\n%s' % unicode(sd))

suds/properties.py

@@ -15,7 +15,7 @@
 # written by: Jeff Ortel ( jortel@redhat.com )
 
 """
-Options classes.
+Properties classes.
 """
 
 from logging import getLogger
@@ -56,7 +56,7 @@ def __init__(self, name, classes, default, linker=AutoLinker()):
         @param classes: The (class) list of permitted values
         @type classes: tuple
         @param default: The default value.
-        @ivar type: any
+        @type default: any
         """
         if not isinstance(classes, (list, tuple)):
             classes = (classes,)

suds/transport/options.py

@@ -14,6 +14,10 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 # written by: Jeff Ortel ( jortel@redhat.com )
 
+"""
+Contains classes for general suds options.
+"""
+
 
 from suds.transport import *
 from suds.properties import *