[Zope3-checkins] CVS: Zope3/src/zope/app/publication - publicationtraverse.py:1.15 zopepublication.py:1.44

Jim Fulton jim at zope.com
Sat Apr 17 13:16:05 EDT 2004


Update of /cvs-repository/Zope3/src/zope/app/publication
In directory cvs.zope.org:/tmp/cvs-serv18496/src/zope/app/publication

Modified Files:
	publicationtraverse.py zopepublication.py 
Log Message:
Removed the last vestiges of name parameters. Even though we stopped
supporting parameters in names (name;foo=bar) years ago, we still had
support in the apis. Sheesh.


=== Zope3/src/zope/app/publication/publicationtraverse.py 1.14 => 1.15 ===
--- Zope3/src/zope/app/publication/publicationtraverse.py:1.14	Sat Mar 20 08:37:13 2004
+++ Zope3/src/zope/app/publication/publicationtraverse.py	Sat Apr 17 13:15:33 2004
@@ -21,7 +21,7 @@
 
 from zope.proxy import removeAllProxies
 from zope.app.traversing.namespace import namespaceLookup
-from zope.app.traversing.namespace import parameterizedNameParse
+from zope.app.traversing.namespace import nsParse
 from zope.publisher.interfaces import IPublishTraverse
 
 class DuplicateNamespaces(Exception):
@@ -37,31 +37,10 @@
 
         if name and name[:1] in '@+':
             # Process URI segment parameters.
-            ns, nm, parms = parameterizedNameParse(name)
-
-            unknown_parms = ()
-            for pname, pval in parms:
-                pset = getattr(self, "_parameterSet%s" % pname, self) # marker
-                if pset is self:
-                    # We don't know about this one
-                    unknown_parms += ((pname, pval),)
-                else:
-                    pset(pname, pval, request)
-
+            ns, nm = nsParse(name)
             if ns:
-                ob2 = namespaceLookup(name, ns, nm, unknown_parms, ob, request)
+                ob2 = namespaceLookup(ns, nm, ob, request)
                 return ProxyFactory(ob2)
-
-            if unknown_parms:
-                nm = "%s;%s" % (
-                    nm,
-                    ';'.join(["%s=%s" % (parm[0], parm[1])
-                              for parm in unknown_parms])
-                    )
-
-            if not nm:
-                # Just set params, so skip
-                return ob
 
         if nm == '.':
             return ob


=== Zope3/src/zope/app/publication/zopepublication.py 1.43 => 1.44 ===
--- Zope3/src/zope/app/publication/zopepublication.py:1.43	Sun Mar 21 11:59:44 2004
+++ Zope3/src/zope/app/publication/zopepublication.py	Sat Apr 17 13:15:33 2004
@@ -342,9 +342,6 @@
         self.annotateTransaction(txn, request, ob)
         return txn
 
-    def _parameterSetskin(self, pname, pval, request):
-        request.setPresentationSkin(pval)
-
 def tryToLogException(arg1, arg2=None):
     if arg2 is None:
         subsystem = 'SiteError'




More information about the Zope3-Checkins mailing list