Ticket #4786: views_debug_py.4.diff

django/views/debug.py

@@ -8 +8 @@
 from django.utils.html import escape
 from django.http import HttpResponse, HttpResponseServerError, HttpResponseNotFound
 from django.utils.encoding import smart_unicode, smart_str
+from django.db.models.loading import get_apps
 
 HIDDEN_SETTINGS = re.compile('SECRET|PASSWORD|PROFANITIES_LIST')
 
@@ -186 +187 @@
         post_context = [line.strip('\n') for line in source[lineno+1:upper_bound]]
 
         return lower_bound, pre_context, context_line, post_context
+        
+    def _is_installed_app_file(self, app_module_paths, filename):
+        for path in app_module_paths:
+            if filename.startswith(path):
+                return True
+        return False
 
     def get_traceback_frames(self):
         frames = []
         tb = self.tb
+        app_module_paths=[]
+        for mod in get_apps():
+            if mod.__name__.startswith('django.'):
+                continue
+            dirname=os.path.dirname(os.path.normpath(mod.__file__))
+            if os.path.basename(dirname)=='models':
+                # models directory instead of app/models.py
+                dirname=os.path.dirname(dirname)
+            app_module_paths.append(dirname)
+        
         while tb is not None:
             # support for __traceback_hide__ which is used by a few libraries
             # to hide internal frames.
@@ -207 +224 @@
                     'tb': tb,
                     'filename': filename,
                     'function': function,
+                    'app_code': self._is_installed_app_file(app_module_paths, filename),
                     'lineno': lineno + 1,
                     'vars': tb.tb_frame.f_locals.items(),
                     'id': id(tb),
@@ -313 +331 @@
     div.context ol.context-line li span { float: right; }
     div.commands { margin-left: 40px; }
     div.commands a { color:black; text-decoration:none; }
+    .app-code { font-weight: bold; }
     #summary { background: #ffc; }
     #summary h2 { font-weight: normal; color: #666; }
     #explanation { background:#eee; }
@@ -477 +496 @@
     <ul class="traceback">
       {% for frame in frames %}
         <li class="frame">
-          <code>{{ frame.filename|escape }}</code> in <code>{{ frame.function|escape }}</code>
+          <code{% if frame.app_code %} class="app-code" {% endif %}>{{ frame.filename|escape }}</code> in <code>{{ frame.function|escape }}</code>
 
           {% if frame.context_line %}
             <div class="context" id="c{{ frame.id }}">
               {% if frame.pre_context %}
                 <ol start="{{ frame.pre_context_lineno }}" class="pre-context" id="pre{{ frame.id }}">{% for line in frame.pre_context %}<li onclick="toggle('pre{{ frame.id }}', 'post{{ frame.id }}')">{{ line|escape }}</li>{% endfor %}</ol>
               {% endif %}
-              <ol start="{{ frame.lineno }}" class="context-line"><li onclick="toggle('pre{{ frame.id }}', 'post{{ frame.id }}')">{{ frame.context_line|escape }} <span>...</span></li></ol>
+              <ol start="{{ frame.lineno }}" class="context-line {% if frame.app_code %} app-code {% endif %}"><li onclick="toggle('pre{{ frame.id }}', 'post{{ frame.id }}')">{{ frame.context_line|escape }} <span>...</span></li></ol>
               {% if frame.post_context %}
                 <ol start='{{ frame.lineno|add:"1" }}' class="post-context" id="post{{ frame.id }}">{% for line in frame.post_context %}<li onclick="toggle('pre{{ frame.id }}', 'post{{ frame.id }}')">{{ line|escape }}</li>{% endfor %}</ol>
               {% endif %}