[Checkins] SVN: zope.traversing/trunk/ ported 3.4.1a1 to trunk

[Juergen Kartnaller]

Log message for revision 82003:
  ported 3.4.1a1 to trunk
  

Changed:
  U   zope.traversing/trunk/CHANGES.txt
  U   zope.traversing/trunk/README.txt
  D   zope.traversing/trunk/setup.cfg
  U   zope.traversing/trunk/setup.py
  U   zope.traversing/trunk/src/zope/traversing/namespace.py
  U   zope.traversing/trunk/src/zope/traversing/tests/test_vh.py

-=-
Modified: zope.traversing/trunk/CHANGES.txt
===================================================================
--- zope.traversing/trunk/CHANGES.txt	2007-11-28 06:54:11 UTC (rev 82002)
+++ zope.traversing/trunk/CHANGES.txt	2007-11-28 08:49:12 UTC (rev 82003)
@@ -2,12 +2,36 @@
 Changes
 =======
 
-3.5
-===
+3.5.0a2 (2007-11-28)
+====================
 
+- ported 3.4.1a1 to trunk
+  - Do not use unicode strings to set the application server in the virtual
+    host namespace. This caused absolute_url to create unicode URL's.
+
 - Added a traverer for ++skin++ for XMLRPC skins (IXMLRPCSkinType). This also
   means that the normal ++skin++ namespace handler is only bound to
   IBrowserRequest. 
 
 - Resolved the dependency on zope.app.applicationcontrol by importing the
   application controller only if the package is available.
+
+
+3.4.1a1 (2007-11-13)
+--------------------
+
+Do not use unicode strings to set the application server in the virtual host
+namespace. This caused absolute_url to create unicode URL's.
+
+
+3.4.0 (2007-09-29)
+------------------
+
+No further changes since 3.4.0a1.
+
+3.4.0a1 (2007-04-22)
+--------------------
+
+Initial release as a separate project, corresponds to zope.traversing
+from Zope 3.4.0a1
+

Modified: zope.traversing/trunk/README.txt
===================================================================
--- zope.traversing/trunk/README.txt	2007-11-28 06:54:11 UTC (rev 82002)
+++ zope.traversing/trunk/README.txt	2007-11-28 08:49:12 UTC (rev 82003)
@@ -1,7 +1,4 @@
-zope.traversing Package Readme
-==============================
-
-Overview
---------
-
-Module for traversing the object tree.
+The ``zope.traversing`` package provides adapteres for resolving
+object paths by traversing an object hierarchy.  This also includes
+support for traversal namespaces (e.g. ``++view++``, ``++skin++``,
+etc.) as well as computing URLs via the ``@@absolute_url`` view.

Deleted: zope.traversing/trunk/setup.cfg
===================================================================
--- zope.traversing/trunk/setup.cfg	2007-11-28 06:54:11 UTC (rev 82002)
+++ zope.traversing/trunk/setup.cfg	2007-11-28 08:49:12 UTC (rev 82003)
@@ -1,2 +0,0 @@
-[egg_info]
-tag_svn_revision = 1
\ No newline at end of file

Modified: zope.traversing/trunk/setup.py
===================================================================
--- zope.traversing/trunk/setup.py	2007-11-28 06:54:11 UTC (rev 82002)
+++ zope.traversing/trunk/setup.py	2007-11-28 08:49:12 UTC (rev 82003)
@@ -15,23 +15,23 @@
 
 $Id$
 """
-
-import os
 from setuptools import setup, find_packages
 
+long_description = (open('README.txt').read() +
+                    '\n\n' +
+                    open('CHANGES.txt').read())
 
 setup(name='zope.traversing',
-      version = '3.5.0a1',
+      version = '3.5.0a2',
       url='http://pypi.python.org/pypi/zope.traversing',
       license='ZPL 2.1',
-      description='Zope traversing',
       author='Zope Corporation and Contributors',
       author_email='zope3-dev at zope.org',
-      long_description="Module for traversing the object tree.",
+      description="Resolving paths in the object hierarchy",
+      long_description=long_description,
 
       packages=find_packages('src'),
       package_dir = {'': 'src'},
-
       namespace_packages=['zope',],
       extras_require = dict(test=['zope.app.testing',
                                   'zope.app.securitypolicy',
@@ -49,6 +49,5 @@
                         'zope.security',
                         ],
       include_package_data = True,
-
       zip_safe = False,
       )

Modified: zope.traversing/trunk/src/zope/traversing/namespace.py
===================================================================
--- zope.traversing/trunk/src/zope/traversing/namespace.py	2007-11-28 06:54:11 UTC (rev 82002)
+++ zope.traversing/trunk/src/zope/traversing/namespace.py	2007-11-28 08:49:12 UTC (rev 82003)
@@ -393,6 +393,7 @@
         traversal_stack = request.getTraversalStack()
         app_names = []
 
+        name = name.encode('utf8')
         if name:
             try:
                 proto, host, port = name.split(":")

Modified: zope.traversing/trunk/src/zope/traversing/tests/test_vh.py
===================================================================
--- zope.traversing/trunk/src/zope/traversing/tests/test_vh.py	2007-11-28 06:54:11 UTC (rev 82002)
+++ zope.traversing/trunk/src/zope/traversing/tests/test_vh.py	2007-11-28 08:49:12 UTC (rev 82003)
@@ -77,6 +77,17 @@
 
         self.assertEqual(request._app_server, 'http://www.fubarco.com:80')
 
+
+    def test_unicode_vh_host(self):
+        from zope.traversing.namespace import vh
+
+        request = TestRequest(['folder1'], ['folder1_1', '++'])
+        ob = object()
+
+        result = vh(ob, request).traverse(u'http:www.fubarco.com:80', ())
+        assert(isinstance(request._app_server, str))
+
+
 def test_suite():
     suite = unittest.TestSuite()
     suite.addTest(unittest.makeSuite(TestVHNamespace))