Django

Code

Changeset 2369

Show
Ignore:
Timestamp:
02/23/06 11:38:00 (3 years ago)
Author:
adrian
Message:

magic-removal: Merged to [2368]

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/magic-removal/django/core/handlers/base.py

    r2360 r2369  
    8686                raise ValueError, "The view %s.%s didn't return an HttpResponse object." % (callback.__module__, callback.func_name) 
    8787 
    88             # Apply response middleware 
    89             for middleware_method in self._response_middleware: 
    90                 response = middleware_method(request, response) 
    91  
    9288            return response 
    9389        except http.Http404, e: 

  • django/branches/magic-removal/django/core/handlers/modpython.py

    r2360 r2369  
    148148            dispatcher.send(signal=signals.request_finished) 
    149149 
     150        # Apply response middleware 
     151        for middleware_method in self._response_middleware: 
     152            response = middleware_method(request, response) 
     153 
    150154        # Convert our custom HttpResponse object back into the mod_python req. 
    151155        populate_apache_request(response, req) 

  • django/branches/magic-removal/django/core/handlers/wsgi.py

    r2360 r2369  
    164164            dispatcher.send(signal=signals.request_finished) 
    165165 
     166        # Apply response middleware 
     167        for middleware_method in self._response_middleware: 
     168            response = middleware_method(request, response) 
     169 
    166170        try: 
    167171            status_text = STATUS_CODE_TEXT[response.status_code] 

  • django/branches/magic-removal/django/core/validators.py

    r2357 r2369  
    2121ansi_time_re = re.compile('^%s$' % _timere) 
    2222ansi_datetime_re = re.compile('^%s %s$' % (_datere, _timere)) 
    23 # From http://www.twilightsoul.com/Default.aspx?tabid=134 
    24 email_re = re.compile(r'^((([\t\x20]*[!#-\'\*\+\-/-9=\?A-Z\^-~]+[\t\x20]*|"[\x01-\x09\x0B\x0C\x0E-\x21\x23-\x5B\x5D-\x7F]*")+)?[\t\x20]*<([\t\x20]*[!#-\'\*\+\-/-9=\?A-Z\^-~]+(\.[!#-\'\*\+\-/-9=\?A-Z\^-~]+)*|"[\x01-\x09\x0B\x0C\x0E-\x21\x23-\x5B\x5D-\x7F]*")@(([a-zA-Z0-9][-a-zA-Z0-9]*[a-zA-Z0-9]\.)+[a-zA-Z]{2,}|\[(([0-9]?[0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]?[0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\])>[\t\x20]*|([\t\x20]*[!#-\'\*\+\-/-9=\?A-Z\^-~]+(\.[!#-\'\*\+\-/-9=\?A-Z\^-~]+)*|"[\x01-\x09\x0B\x0C\x0E-\x21\x23-\x5B\x5D-\x7F]*")@(([a-zA-Z0-9][-a-zA-Z0-9]*[a-zA-Z0-9]\.)+[a-zA-Z]{2,}|\[(([0-9]?[0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]?[0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\]))$') 
     23email_re = re.compile(r'^[A-Z0-9._%-][+A-Z0-9._%-]*@(?:[A-Z0-9-]+\.)+[A-Z]{2,4}$', re.IGNORECASE) 
    2524integer_re = re.compile(r'^-?\d+$') 
    2625ip4_re = re.compile(r'^(25[0-5]|2[0-4]\d|[0-1]?\d?\d)(\.(25[0-5]|2[0-4]\d|[0-1]?\d?\d)){3}$') 

  • django/branches/magic-removal/docs/faq.txt

    r2273 r2369  
    104104.. _`Wilson Miner`: http://www.wilsonminer.com/live/ 
    105105 
     106Which sites use Django? 
     107----------------------- 
     108 
     109The Django wiki features a `list of Django-powered sites`_. Feel free to add 
     110your Django-powered site to the list. 
     111 
     112.. _list of Django-powered sites: http://code.djangoproject.com/wiki/DjangoPoweredSites 
     113 
    106114Django appears to be a MVC framework, but you call the Controller the "view", and the View the "template". How come you don't use the standard names? 
    107115-----------------------------------------------------------------------------------------------------------------------------------------------------