merge

README.rst

@@ -80,7 +80,7 @@ Contribute
 
 :Report issues: `WSME issue tracker`_
 :Source code: hg clone https://bitbucket.org/cdevienne/wsme/
-:Jenkins: https://jenkins.shiningpanda.com/wsme/job/wsme/
+:Jenkins: https://jenkins.shiningpanda.com/wsme/
 
 .. _Changelog: http://packages.python.org/WSME/changes.html
 .. _python-wsme mailinglist: http://groups.google.com/group/python-wsme

doc/changes.rst

@@ -1,6 +1,13 @@
 Changes
 =======
 
+0.4 (next)
+----------
+
+*   Now supports Python 3.2
+
+*   String types handling is clearer.
+
 0.3 (2012-04-20)
 ----------------
 

doc/conf.py

@@ -230,7 +230,10 @@ wsme_protocols = [
     'restjson', 'restxml', 'soap', 'extdirect'
 ]
 
-intersphinx_mapping = {'python': ('http://docs.python.org/', None)}
+intersphinx_mapping = {
+    'python': ('http://docs.python.org/', None),
+    'six': ('http://packages.python.org/six/', None),
+}
 
 
 def setup(app):

doc/types.rst

@@ -11,13 +11,16 @@ the different protocols will map to theirs own basic types.
 
 The native types are :
 
-    -   .. wsme:type:: str
+    -   .. wsme:type:: bytes
     
-            A non unicode string (:py:class:`str`)
+            A pure-ascii string (:py:class:`wsme.types.bytes` which is
+            :py:class:`str` in Python 2 and :py:class:`bytes` in Python 3).
+            
 
-    -   .. wsme:type:: unicode
+    -   .. wsme:type:: text
 
-            A unicode string (:py:class:`unicode`)
+            A unicode string (:py:class:`wsme.types.text` which is
+            :py:class:`unicode` in Python 2 and :py:class:`str` in Python 3).
 
     -   .. wsme:type:: int
     

setup.py

@@ -9,6 +9,13 @@ exec(compile(open(filename).read(), filename, 'exec'), release)
 
 long_description = open("README.rst", 'rt').read()
 
+if sys.version_info[:2] <= (2, 5):
+    webob_version = '<=1.1.1'
+elif sys.version_info[:2] >= (3, 0):
+    webob_version = '>=1.2b3'
+else:
+    webob_version = ''
+
 setup(
     name=release['name'],
     version=release['version'],
@@ -24,7 +31,7 @@ setup(
     install_requires=[
         'six',
         'simplegeneric',
-        'webob' + ('<=1.1.1' if sys.version_info[:2] <= (2, 5) else '>=1.2b3'),
+        'webob' + webob_version
     ],
     classifiers=[
         'Development Status :: 3 - Alpha',
@@ -33,6 +40,7 @@ setup(
         'Programming Language :: Python :: 2.5',
         'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3.2',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
         'License :: OSI Approved :: MIT License',

wsme/release.py

@@ -1,5 +1,5 @@
 name = "WSME"
-version = "0.3"
+version = "0.4"
 
 description = """Web Services Made Easy makes it easy to \
 implement multi-protocol webservices."""