Simplify resolveDefaultContext

Author: Cito

webware/URLParser.py

@@ -139,7 +139,7 @@ def __init__(self, app):
 
     # region Context handling
 
-    def resolveDefaultContext(self, name, dest):
+    def resolveDefaultContext(self, dest):
         """Find default context.
 
         Figure out if the default context refers to an existing context,
@@ -149,19 +149,16 @@ def resolveDefaultContext(self, name, dest):
         or 'default' if the default context is unique.
         """
         contexts = self._contexts
-        contextDirs = {}
-        # make a list of existing context paths
-        for name, path in contexts.items():
-            if name != 'default':
-                contextDirs[self.absContextPath(path)] = name
         if dest in contexts:
             # The default context refers to another context,
             # not a unique context.  Return the name of that context.
             return dest
-        if self.absContextPath(dest) in contextDirs:
-            # The default context has the same directory
-            # as another context, so it's still not unique
-            return contextDirs[self.absContextPath(dest)]
+        destPath = self.absContextPath(dest)
+        for name, path in contexts.items():
+            if name != 'default' and self.absContextPath(path) == destPath:
+                # The default context has the same directory
+                # as another context, so it's still not unique
+                return name
         # The default context has no other name
         return 'default'
 
@@ -173,7 +170,7 @@ def addContext(self, name, path):
         the context name.
         """
         if name == 'default':
-            dest = self.resolveDefaultContext(name, path)
+            dest = self.resolveDefaultContext(name)
             self._defaultContext = dest
             if dest != 'default':
                 # in this case default refers to an existing context, so