Changeset 2065

Timestamp:

06/25/09 11:29:43 (9 months ago)

Author:

JensDiemer

Message:

bugfix: delete old assert statement. + codecleanup

Files:

• branches/0.9/pylucid_project/apps/pylucid/views.py (modified) (19 diffs)

branches/0.9/pylucid_project/apps/pylucid/views.py

@@ -35 +35 @@
     # default Language instance set in system preferences:
     default_lang_entry = request.PYLUCID.default_lang_entry
-    
+
     try:
         pagecontent = PageTree.objects.get_pagecontent(request)
@@ -45 +45 @@
             )
         )
-    
+
     if (settings.DEBUG or settings.PYLUCID.I18N_DEBUG) and (pagecontent.lang != lang_entry):
         request.page_msg.error(
@@ -52 +52 @@
             )
         )
-        
+
     return pagecontent
 
-   
+
 def _render_template(request, page_content):
     context = request.PYLUCID.context
@@ -61 +61 @@
     context["page_content"] = page_content
     complete_page = render.render_string_template(page_template, context)
-       
+
     response = http.HttpResponse(complete_page, mimetype="text/html")
     response["content-language"] = context["page_language"]
@@ -78 +78 @@
 
 def _render_page(request, pagetree, prefix_url=None, rest_url=None):
-    """ render a cms page """   
+    """ render a cms page """
     request.PYLUCID.pagetree = pagetree
 
@@ -84 +84 @@
     pagemeta = PageTree.objects.get_pagemeta(request)
     request.PYLUCID.pagemeta = pagemeta
-    
+
     # Get template content and add it to PyLucid objects
     template_name = pagetree.design.template
     page_template, origin = loader.find_template_source(template_name)
     request.PYLUCID.page_template = page_template
-    
+
     # Create initial context object
     context = RequestContext(request, {
@@ -100 +100 @@
     })
     request.PYLUCID.context = context
-    
+
     # Get all plugin context middlewares from the template and add them to the context
     pylucid_plugin.context_middleware_request(request)
-    
+
     # call page plugin, if current page is a plugin page
     page_plugin_response = None
@@ -131 +131 @@
     # FIXME: Do this erlear: So A plugin page can change the values!
     for itemname in ("createby", "lastupdateby", "createtime", "lastupdatetime"):
-        context["page_%s" % itemname] = getattr(updateinfo_object, itemname)        
-    
+        context["page_%s" % itemname] = getattr(updateinfo_object, itemname)
+
     # call a pylucid plugin "html get view", if exist
     get_view_response = pylucid_plugin.call_get_views(request)
     if get_view_response != None:
         # Use plugin response      
-        assert(isinstance(get_view_response, http.HttpResponse),
-            "pylucid plugins must return a http.HttpResponse instance or None!"
-        )
         if isinstance(get_view_response, http.HttpResponse):
             # Plugin would be build the complete html page
             response = _apply_context_middleware(request, get_view_response)
             return response
-        
-        assert isinstance(get_view_response, basestring), \
-            "Plugin get view must return None, HttpResponse or a basestring!"
-        
+
+        assert isinstance(get_view_response, basestring), (
+            "Plugin get view must return None, HttpResponse or a basestring! (returned: %r)"
+        ) % type(get_view_response)
+
         # Plugin replace the page content
         context["page_content"] = get_view_response
-    
+
     if page_plugin_response == None and get_view_response == None:
         # No Plugin has changed the PageContent -> apply markup on PageContent
@@ -156 +154 @@
     else:
         raw_html_content = context["page_content"]
-    
+
     html_content = render.render_string_template(raw_html_content, context)
 
     response = _render_template(request, page_content=html_content)
-    
+
     response = _apply_context_middleware(request, response)
     return response
@@ -189 +187 @@
                 msg = ""
             raise http.Http404(msg)
-    
+
     try:
         headfile = EditableHtmlHeadFile.objects.get(filepath=filepath)
@@ -198 +196 @@
             msg = ""
         raise http.Http404(msg)
-    
+
     if headfile.render:
         content = headfile.get_rendered(colorscheme)
     else:
         content = headfile.content
-        
-    mimetype = headfile.mimetype    
+
+    mimetype = headfile.mimetype
     return http.HttpResponse(content, mimetype=mimetype)
 
@@ -229 +227 @@
     # Get the first PageTree entry
     pagetree = PageTree.objects.get_root_page()
-    
+
     return _render_page(request, pagetree)
 
@@ -236 +234 @@
     """ render the first root page in system default language """
     _add_pylucid_request_objects(request)
-    
+
     # activate language via auto detection
     i18n.activate_auto_language(request)
-    
+
     return _render_root_page(request)
 
@@ -246 +244 @@
     """ url with lang code but no page slug """
     _add_pylucid_request_objects(request)
-    
+
     try:
         lang_entry = Language.objects.get(code=url_lang_code)
@@ -253 +251 @@
         # redirect to "/"
         return http.HttpResponseRedirect("/")
-    
+
     # activate i18n
     i18n.activate_language(request, lang_entry, save=True)
-    
+
     return _render_root_page(request)
 
@@ -264 +262 @@
     """ Redirect to a url with the default language code. """
     # activate language via auto detection
-    i18n.activate_auto_language(request) 
-    
+    i18n.activate_auto_language(request)
+
     # Check only, if url_path is right (if there exist a pagetree object)
     # otherwise -> 404 would be raised
     _get_pagetree(url_path)
-    
+
     lang_code = request.LANGUAGE_CODE
     url = reverse('PyLucid-resolve_url', kwargs={'url_lang_code': lang_code, 'url_path': url_path})
-    
+
     # redirect to url with lang_code
     return http.HttpResponseRedirect(url)
@@ -286 +284 @@
     """ url with lang_code and sub page path """
     _add_pylucid_request_objects(request)
-    
+
     try:
         lang_entry = Language.objects.get(code=url_lang_code)
@@ -293 +291 @@
         # redirect to a url with the default language code.
         return _i18n_redirect(request, url_path)
-    
+
     # activate i18n
     i18n.activate_language(request, lang_entry, save=True)
-    
+
     pagetree, prefix_url, rest_url = _get_pagetree(url_path)
-    
+
     return _render_page(request, pagetree, prefix_url, rest_url)
 
-    
+
 def page_without_lang(request, url_path):
     """
@@ -308 +306 @@
     """
     _add_pylucid_request_objects(request)
-    
+
     # redirect to a url with the default language code.
     return _i18n_redirect(request, url_path)
 
 
-    
-
-
-
-
-
-
+
+
+
+
+
+
+