[CMF-checkins] CVS: CMF/CMFDefault - URLTool.py:1.14 __init__.py:1.18

[Yvo Schubbe]

Update of /cvs-repository/CMF/CMFDefault
In directory cvs.zope.org:/tmp/cvs-serv5174/CMFDefault

Modified Files:
	URLTool.py __init__.py 
Log Message:
Merged yuppie-buglets1-branch:
- Fixed buglets. (Collector #94 and #95)
- Removed string functions and useless imports.

=== CMF/CMFDefault/URLTool.py 1.13 => 1.14 ===
--- CMF/CMFDefault/URLTool.py:1.13	Wed Dec 11 17:21:39 2002
+++ CMF/CMFDefault/URLTool.py	Tue Feb  4 17:43:36 2003
@@ -1,14 +1,15 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
-# 
+# Copyright (c) 2002 Zope Corporation and Contributors.
+# All Rights Reserved.
+#
 # This software is subject to the provisions of the Zope Public License,
 # Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 # FOR A PARTICULAR PURPOSE
-# 
+#
 ##############################################################################
 """ CMFDefault portal_url tool.
 


=== CMF/CMFDefault/__init__.py 1.17 => 1.18 ===
--- CMF/CMFDefault/__init__.py:1.17	Wed Dec 11 17:21:39 2002
+++ CMF/CMFDefault/__init__.py	Tue Feb  4 17:43:36 2003
@@ -1,23 +1,24 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
-# 
+# Copyright (c) 2001-2003 Zope Corporation and Contributors.
+# All Rights Reserved.
+#
 # This software is subject to the provisions of the Zope Public License,
 # Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 # FOR A PARTICULAR PURPOSE
-# 
+#
 ##############################################################################
 """ Default implementation of CMFCore.
 
 $Id$
 """
+
 from Products import CMFCore
 
 from Products.CMFCore.CMFCorePermissions import AddPortalContent
-import Products.CMFCore
 
 from Products.CMFCore.DirectoryView import registerDirectory
 from Products.CMFCore.utils import initializeBasesPhase1