Django

Code

Changeset 57

Show
Ignore:
Timestamp:
07/15/05 12:09:01 (3 years ago)
Author:
adrian
Message:

Renamed CMSRequest to DjangoRequest?, and CMSContext to DjangoContext?. Old code will still work.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/django/contrib/comments/views/comments.py

    r9 r57  
    22from django.core.mail import mail_admins, mail_managers 
    33from django.core.exceptions import Http404, ObjectDoesNotExist 
    4 from django.core.extensions import CMSContext as Context 
     4from django.core.extensions import DjangoContext as Context 
    55from django.models.auth import sessions 
    66from django.models.comments import comments, freecomments 

  • django/trunk/django/contrib/comments/views/karma.py

    r3 r57  
    11from django.core import template_loader 
    2 from django.core.extensions import CMSContext as Context 
     2from django.core.extensions import DjangoContext as Context 
    33from django.core.exceptions import Http404 
    44from django.models.comments import comments, karma 

  • django/trunk/django/contrib/comments/views/userflags.py

    r3 r57  
    11from django.core import template_loader 
    2 from django.core.extensions import CMSContext as Context 
     2from django.core.extensions import DjangoContext as Context 
    33from django.core.exceptions import Http404 
    44from django.models.comments import comments, moderatordeletions, userflags 

  • django/trunk/django/core/extensions.py

    r9 r57  
    1 "Specialized Context and ModPythonRequest classes for our CMS. Use these!" 
     1"Specialized Context and ModPythonRequest classes for Django. Use these!" 
    22 
    33from django.core.template import Context 
    …… 
    66from pprint import pformat 
    77 
    8 class CMSContext(Context): 
    9     """This subclass of template.Context automatically populates 'user' and 
    10     'messages' in the context. Use this.""" 
     8class DjangoContext(Context): 
     9    """ 
     10    This subclass of template.Context automatically populates 'user' and 
     11    'messages' in the context. 
     12    """ 
    1113    def __init__(self, request, dict={}): 
    1214        Context.__init__(self, dict) 
    …… 
    3840        return PermLookupDict(self.user, module_name) 
    3941 
    40 class CMSRequest(ModPythonRequest): 
    41     "A special version of ModPythonRequest with support for CMS sessions" 
     42class DjangoRequest(ModPythonRequest): 
     43    "A special version of ModPythonRequest with support for Django sessions." 
    4244    def __init__(self, req): 
    4345        ModPythonRequest.__init__(self, req) 
    4446 
    4547    def __repr__(self): 
    46         return '<CMSRequest\npath:%s,\nGET:%s,\nPOST:%s,\nCOOKIES:%s,\nMETA:%s,\nuser:%s>' % \ 
     48        return '<DjangoRequest\npath:%s,\nGET:%s,\nPOST:%s,\nCOOKIES:%s,\nMETA:%s,\nuser:%s>' % \ 
    4749            (self.path, pformat(self.GET), pformat(self.POST), pformat(self.COOKIES), 
    4850            pformat(self.META), pformat(self.user)) 
    …… 
    7880    session = property(_get_session, _set_session) 
    7981    user = property(_get_user, _set_user) 
     82 
     83# For legacy purposes. 
     84CMSContext = DjangoContext 
     85CMSRequest = DjangoRequest 

  • django/trunk/django/core/handler.py

    r3 r57  
    7878    def get_request(self, req): 
    7979        "Returns an HttpRequest object for the given mod_python req object" 
    80         from django.core.extensions import CMSRequest 
    81         return CMSRequest(req) 
     80        from django.core.extensions import DjangoRequest 
     81        return DjangoRequest(req) 
    8282 
    8383    def get_response(self, path, request): 

  • django/trunk/django/middleware/admin.py

    r3 r57  
    11from django.utils import httpwrappers 
    22from django.core import template_loader 
    3 from django.core.extensions import CMSContext as Context 
     3from django.core.extensions import DjangoContext as Context 
    44from django.models.auth import sessions, users 
    55from django.views.registration import passwords 

  • django/trunk/django/views/admin/doc.py

    r3 r57  
    77from django.models.core import sites 
    88from django.views.decorators.cache import cache_page 
    9 from django.core.extensions import CMSContext as Context 
     9from django.core.extensions import DjangoContext as Context 
    1010from django.core.exceptions import Http404, ViewDoesNotExist 
    1111from django.utils.httpwrappers import HttpResponse, HttpResponseRedirect 
    …… 
    1515except ImportError: 
    1616    doc = None 
    17      
     17 
    1818# Exclude methods starting with these strings from documentation 
    1919MODEL_METHODS_EXCLUDE = ('_', 'add_', 'delete', 'save', 'set_') 
    …… 
    2222    if not doc: 
    2323        return missing_docutils_page(request) 
    24          
     24 
    2525    t = template_loader.get_template('doc/index') 
    2626    c = Context(request, {}) 
    2727    return HttpResponse(t.render(c)) 
    28      
     28 
    2929def bookmarklets(request): 
    3030    t = template_loader.get_template('doc/bookmarklets') 
    …… 
    3737    if not doc: 
    3838        return missing_docutils_page(request) 
    39          
    40     # We have to jump through some hoops with registered_tags to make sure  
     39 
     40    # We have to jump through some hoops with registered_tags to make sure 
    4141    # they don't get messed up by loading outside tagsets 
    42     saved_tagset = template.registered_tags.copy(), template.registered_filters.copy()       
     42    saved_tagset = template.registered_tags.copy(), template.registered_filters.copy() 
    4343    load_all_installed_template_libraries() 
    4444 
    …… 
    7777    if not doc: 
    7878        return missing_docutils_page(request) 
    79          
    80     saved_tagset = template.registered_tags.copy(), template.registered_filters.copy()       
     79 
     80    saved_tagset = template.registered_tags.copy(), template.registered_filters.copy() 
    8181    load_all_installed_template_libraries() 
    8282 
    …… 
    192192        raise Http404 
    193193    opts = model.Klass._meta 
    194      
     194 
    195195    # Gather fields/field descriptions 
    196196    fields = [] 
    …… 
    252252            except ImportError: 
    253253                pass 
    254                  
     254 
    255255def get_return_data_type(func_name): 
    256256    """Return a somewhat-helpful data type given a function name""" 
    …… 
    293293} 
    294294 
    295 def get_readable_field_data_type(field):     
     295def get_readable_field_data_type(field): 
    296296    return DATA_TYPE_MAPPING[field.__class__.__name__] % field.__dict__ 
    297297 
    …… 
    299299    """ 
    300300    Return a list of views from a list of urlpatterns. 
    301      
     301 
    302302    Each object in the returned list is a two-tuple: (view_func, regex) 
    303303    """ 

  • django/trunk/django/views/admin/main.py

    r9 r57  
    33from django.core import formfields, meta, template_loader 
    44from django.core.exceptions import Http404, ObjectDoesNotExist, PermissionDenied 
    5 from django.core.extensions import CMSContext as Context 
     5from django.core.extensions import DjangoContext as Context 
    66from django.models.auth import log 
    77from django.utils.html import strip_tags 

  • django/trunk/django/views/admin/template.py

    r3 r57  
    11from django.core import formfields, template_loader, validators 
    22from django.core import template 
    3 from django.core.extensions import CMSContext as Context 
     3from django.core.extensions import DjangoContext as Context 
    44from django.utils.httpwrappers import HttpResponse 
    55from django.models.core import sites 

  • django/trunk/django/views/auth/login.py

    r3 r57  
    11from django.parts.auth.formfields import AuthenticationForm 
    22from django.core import formfields, template_loader 
    3 from django.core.extensions import CMSContext as Context 
     3from django.core.extensions import DjangoContext as Context 
    44from django.models.auth import sessions 
    55from django.models.core import sites 

  • django/trunk/django/views/core/flatfiles.py

    r3 r57  
    11from django.core import template_loader 
    22from django.core.exceptions import Http404 
    3 from django.core.extensions import CMSContext as Context 
     3from django.core.extensions import DjangoContext as Context 
    44from django.models.core import flatfiles 
    55from django.utils.httpwrappers import HttpResponse 

  • django/trunk/django/views/defaults.py

    r9 r57  
    11from django.core import template_loader 
    22from django.core.exceptions import Http404, ObjectDoesNotExist 
    3 from django.core.extensions import CMSContext as Context 
     3from django.core.extensions import DjangoContext as Context 
    44from django.models.core import sites 
    55from django.utils import httpwrappers 

  • django/trunk/django/views/generic/date_based.py

    r3 r57  
    11from django.core import template_loader 
    22from django.core.exceptions import Http404, ObjectDoesNotExist 
    3 from django.core.extensions import CMSContext as Context 
     3from django.core.extensions import DjangoContext as Context 
    44from django.core.xheaders import populate_xheaders 
    55from django.models import get_module 

  • django/trunk/django/views/generic/list_detail.py

    r3 r57  
    33from django.utils.httpwrappers import HttpResponse 
    44from django.core.xheaders import populate_xheaders 
    5 from django.core.extensions import CMSContext as Context 
     5from django.core.extensions import DjangoContext as Context 
    66from django.core.paginator import ObjectPaginator, InvalidPage 
    77from django.core.exceptions import Http404, ObjectDoesNotExist 

  • django/trunk/django/views/registration/passwords.py

    r3 r57  
    11from django.core import formfields, template_loader, validators 
    2 from django.core.extensions import CMSContext as Context 
     2from django.core.extensions import DjangoContext as Context 
    33from django.models.auth import users 
    44from django.views.decorators.auth import login_required