Author: mtredinnick
Date: 2008-07-19 14:37:55 -0500 (Sat, 19 Jul 2008)
New Revision: 7995
Removed:
django/trunk/django/utils/thread_support.py
Modified:
django/trunk/django/core/handlers/base.py
django/trunk/django/core/handlers/modpython.py
django/trunk/django/core/handlers/wsgi.py
django/trunk/django/core/urlresolvers.py
django/trunk/django/http/__init__.py
django/trunk/django/test/client.py
django/trunk/django/utils/translation/trans_real.py
Log:
Revert [7991] - [7993]. I was committing from the wrong branch. Sorry 'bout
that, folks. :-(
Modified: django/trunk/django/core/handlers/base.py
===================================================================
--- django/trunk/django/core/handlers/base.py 2008-07-19 19:32:29 UTC (rev
7994)
+++ django/trunk/django/core/handlers/base.py 2008-07-19 19:37:55 UTC (rev
7995)
@@ -3,7 +3,6 @@
from django import http
from django.core import signals
from django.dispatch import dispatcher
-from django.utils.encoding import force_unicode
class BaseHandler(object):
# Changes that are always applied to a response (in this order).
@@ -74,8 +73,7 @@
resolver = urlresolvers.RegexURLResolver(r'^/', urlconf)
try:
- callback, callback_args, callback_kwargs = resolver.resolve(
- request.path_info)
+ callback, callback_args, callback_kwargs =
resolver.resolve(request.path)
# Apply view middleware
for middleware_method in self._view_middleware:
@@ -172,21 +170,3 @@
response = func(request, response)
return response
-def get_script_name(environ):
- """
- Returns the equivalent of the HTTP request's SCRIPT_NAME environment
- variable. If Apache mod_rewrite has been used, returns what would have been
- the script name prior to any rewriting (so it's the script name as seen
- from the client's perspective).
-
- Note: this isn't used by the mod_python handler, since the equivalent of
- SCRIPT_NAME isn't available there.
- """
- if not environ.get('DJANGO_USE_POST_REWRITE'):
- # If mod_rewrite had a whack at the URL, Apache set SCRIPT_URL to
- # SCRIPT_NAME before applying any rewrites.
- script_url = force_unicode(environ.get('SCRIPT_URL', ''))
- if script_url:
- return script_url
- return force_unicode(environ.get('SCRIPT_NAME', ''))
-
Modified: django/trunk/django/core/handlers/modpython.py
===================================================================
--- django/trunk/django/core/handlers/modpython.py 2008-07-19 19:32:29 UTC
(rev 7994)
+++ django/trunk/django/core/handlers/modpython.py 2008-07-19 19:37:55 UTC
(rev 7995)
@@ -16,15 +16,6 @@
def __init__(self, req):
self._req = req
self.path = force_unicode(req.uri)
- root = req.get_options().get('django.root', '')
- self._django_root = root
- # req.path_info isn't necessarily computed correctly in all
- # circumstances (it's out of mod_python's control a bit), so we use
- # req.uri and some string manipulations to get the right value.
- if root and req.uri.startswith(root):
- self.path_info = force_unicode(req.uri[len(root):])
- else:
- self.path_info = self.path
def __repr__(self):
# Since this is called as part of error handling, we need to be very
@@ -109,7 +100,7 @@
'CONTENT_LENGTH': self._req.clength, # This may be wrong
'CONTENT_TYPE': self._req.content_type, # This may be
wrong
'GATEWAY_INTERFACE': 'CGI/1.1',
- 'PATH_INFO': self.path_info,
+ 'PATH_INFO': self._req.path_info,
'PATH_TRANSLATED': None, # Not supported
'QUERY_STRING': self._req.args,
'REMOTE_ADDR': self._req.connection.remote_ip,
@@ -117,7 +108,7 @@
'REMOTE_IDENT': self._req.connection.remote_logname,
'REMOTE_USER': self._req.user,
'REQUEST_METHOD': self._req.method,
- 'SCRIPT_NAME': self._django_root,
+ 'SCRIPT_NAME': None, # Not supported
'SERVER_NAME': self._req.server.server_hostname,
'SERVER_PORT': self._req.server.port,
'SERVER_PROTOCOL': self._req.protocol,
Modified: django/trunk/django/core/handlers/wsgi.py
===================================================================
--- django/trunk/django/core/handlers/wsgi.py 2008-07-19 19:32:29 UTC (rev
7994)
+++ django/trunk/django/core/handlers/wsgi.py 2008-07-19 19:37:55 UTC (rev
7995)
@@ -7,7 +7,7 @@
from django import http
from django.core import signals
-from django.core.handlers import base
+from django.core.handlers.base import BaseHandler
from django.dispatch import dispatcher
from django.utils import datastructures
from django.utils.encoding import force_unicode
@@ -74,14 +74,9 @@
class WSGIRequest(http.HttpRequest):
def __init__(self, environ):
- script_name = base.get_script_name()
- path_info = force_unicode(environ.get('PATH_INFO', '/'))
self.environ = environ
- self.path_info = path_info
- self.path = '%s%s' % (script_name, path_info)
+ self.path = force_unicode(environ['PATH_INFO'])
self.META = environ
- self.META['PATH_INFO'] = path_info
- self.META['SCRIPT_NAME'] = script_name
self.method = environ['REQUEST_METHOD'].upper()
def __repr__(self):
@@ -183,7 +178,7 @@
REQUEST = property(_get_request)
raw_post_data = property(_get_raw_post_data)
-class WSGIHandler(base.BaseHandler):
+class WSGIHandler(BaseHandler):
initLock = Lock()
request_class = WSGIRequest
Modified: django/trunk/django/core/urlresolvers.py
===================================================================
--- django/trunk/django/core/urlresolvers.py 2008-07-19 19:32:29 UTC (rev
7994)
+++ django/trunk/django/core/urlresolvers.py 2008-07-19 19:37:55 UTC (rev
7995)
@@ -291,11 +291,10 @@
def resolve(path, urlconf=None):
return get_resolver(urlconf).resolve(path)
-def reverse(viewname, urlconf=None, args=None, kwargs=None, prefix=u'/'):
+def reverse(viewname, urlconf=None, args=None, kwargs=None):
args = args or []
kwargs = kwargs or {}
- return iri_to_uri(prefix +
- get_resolver(urlconf).reverse(viewname, *args, **kwargs))
+ return iri_to_uri(u'/' + get_resolver(urlconf).reverse(viewname, *args,
**kwargs))
def clear_url_caches():
global _resolver_cache
Modified: django/trunk/django/http/__init__.py
===================================================================
--- django/trunk/django/http/__init__.py 2008-07-19 19:32:29 UTC (rev
7994)
+++ django/trunk/django/http/__init__.py 2008-07-19 19:37:55 UTC (rev
7995)
@@ -31,7 +31,6 @@
def __init__(self):
self.GET, self.POST, self.COOKIES, self.META, self.FILES = {}, {}, {},
{}, {}
self.path = ''
- self.path_info = ''
self.method = None
def __repr__(self):
@@ -443,4 +442,3 @@
return unicode(s, encoding, 'replace')
else:
return s
-
Modified: django/trunk/django/test/client.py
===================================================================
--- django/trunk/django/test/client.py 2008-07-19 19:32:29 UTC (rev 7994)
+++ django/trunk/django/test/client.py 2008-07-19 19:37:55 UTC (rev 7995)
@@ -190,7 +190,7 @@
'PATH_INFO': '/',
'QUERY_STRING': '',
'REQUEST_METHOD': 'GET',
- 'SCRIPT_NAME': '',
+ 'SCRIPT_NAME': None,
'SERVER_NAME': 'testserver',
'SERVER_PORT': 80,
'SERVER_PROTOCOL': 'HTTP/1.1',
Deleted: django/trunk/django/utils/thread_support.py
===================================================================
--- django/trunk/django/utils/thread_support.py 2008-07-19 19:32:29 UTC (rev
7994)
+++ django/trunk/django/utils/thread_support.py 2008-07-19 19:37:55 UTC (rev
7995)
@@ -1,12 +0,0 @@
-"""
-Code used in a couple of places to work with the current thread's environment.
-Current users include i18n and request prefix handling.
-"""
-
-try:
- import threading
- currentThread = threading.currentThread
-except ImportError:
- def currentThread():
- return "no threading"
-
Modified: django/trunk/django/utils/translation/trans_real.py
===================================================================
--- django/trunk/django/utils/translation/trans_real.py 2008-07-19 19:32:29 UTC
(rev 7994)
+++ django/trunk/django/utils/translation/trans_real.py 2008-07-19 19:37:55 UTC
(rev 7995)
@@ -8,8 +8,19 @@
from cStringIO import StringIO
from django.utils.safestring import mark_safe, SafeData
-from django.utils.thread_support import currentThread
+try:
+ import threading
+ hasThreads = True
+except ImportError:
+ hasThreads = False
+
+if hasThreads:
+ currentThread = threading.currentThread
+else:
+ def currentThread():
+ return 'no threading'
+
# Translations are cached in a dictionary for every language+app tuple.
# The active translations are stored by threadid to make them thread local.
_translations = {}
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
