Changeset 8215 for django/branches/gis/django/core/urlresolvers.py

Timestamp:

08/05/08 12:15:33 (5 months ago)

Author:

jbronn

Message:

gis: Merged revisions 7981-8001,8003-8011,8013-8033,8035-8036,8038-8039,8041-8063,8065-8076,8078-8139,8141-8154,8156-8214 via svnmerge from trunk.

Files:

• django/branches/gis (modified) (1 prop)
• django/branches/gis/django/core/urlresolvers.py (modified) (5 diffs)

django/branches/gis/django/core/urlresolvers.py

@@ -7 +7 @@
-    (view_function, function_args, function_kwargs)
-"""
+
+import re
-
-from django.http import Http404
@@ -12 +14 @@
-from django.utils.encoding import iri_to_uri, force_unicode, smart_str
-from django.utils.functional import memoize
-
+
-
-try:
@@ -21 +23 @@
-_resolver_cache = {} # Maps urlconf modules to RegexURLResolver instances.
-_callable_cache = {} # Maps view and url pattern names to their view functions.
+
+# SCRIPT_NAME prefixes for each thread are stored here. If there's no entry for
+# the current thread (which is the only one we ever access), it is assumed to
+# be empty.
+_prefixes = {}
-
-class Resolver404(Http404):
@@ -292 +299 @@
-    return get_resolver(urlconf).resolve(path)
-
-
+, prefix=None
-    args = args or []
-    kwargs = kwargs or {}
-
+
+
+
+
-
-def clear_url_caches():
@@ -302 +312 @@
-    _resolver_cache.clear()
-    _callable_cache.clear()
+
+def set_script_prefix(prefix):
+    """
+    Sets the script prefix for the current thread.
+    """
+    if not prefix.endswith('/'):
+        prefix += '/'
+    _prefixes[currentThread()] = prefix
+
+def get_script_prefix():
+    """
+    Returns the currently active script prefix. Useful for client code that
+    wishes to construct their own URLs manually (although accessing the request
+    instance is normally going to be a lot cleaner).
+    """
+    return _prefixes.get(currentThread(), u'/')
+