Ticket #2437: django_dpaste-2.diff

django/views/debug.py

@@ -131 +131 @@
         if start is not None and end is not None:
             unicode_str = exc_value.args[1]
             unicode_hint = smart_unicode(unicode_str[max(start-5, 0):min(end+5, len(unicode_str))], 'ascii', errors='replace')
-
+    from django import get_version
     t = Template(TECHNICAL_500_TEMPLATE, name='Technical 500 template')
     c = Context({
         'exception_type': exc_type.__name__,
@@ -144 +144 @@
         'settings': get_safe_settings(),
         'sys_executable' : sys.executable,
         'sys_version_info' : '%d.%d.%d' % sys.version_info[0:3],
+        'django_version_info' : get_version(),
         'template_info': template_info,
         'template_does_not_exist': template_does_not_exist,
         'loader_debug_info': loader_debug_info,
@@ -329 +330 @@
       toggle('browserTraceback', 'pastebinTraceback');
       return false;
     }
+    function submitDPaste() {
+      document.pasteform.submit();
+    }
     //-->
   </script>
 </head>
@@ -409 +413 @@
 </div>
 {% endif %}
 <div id="traceback">
-  <h2>Traceback <span>(innermost last)</span></h2>
+  <h2>Traceback</h2>
   <div class="commands"><a href="#" onclick="return switchPastebinFriendly(this);">Switch to copy-and-paste view</a></div>
   <br/>
   {% autoescape off %}
@@ -462 +466 @@
         <tr>
           <td>
             <code>
-Traceback (most recent call last):<br/>
+Environment:<br/>
+Django Version: {{ django_version_info }}<br/>
+Installed Applications: <br/>
+{{ settings.INSTALLED_APPS|pprint|escape }}
+Installed Middleware: <br/>
+{{ settings.MIDDLEWARE_CLASSES|pprint|escape }}
+<br/><br/>
+Traceback:<br/>
 {% for frame in frames %}
   File "{{ frame.filename }}" in {{ frame.function }}<br/>
   {% if frame.context_line %}
@@ -477 +488 @@
     </table>
   </div>
   {% endautoescape %}
+<a href="#" onclick="return submitDPaste();">Submit to DPaste</a><sup>?</sup><br/>
+<form action="http://dpaste.com/" name="pasteform" id="pasteform" method="post">
+<input type="hidden" name="language" value="PythonConsole" />
+<input type="hidden" name="title" value="{{ exception_type|escape }} at {{ request.path|escape }}" />
+<input type="hidden" name="source" value="Django Dpaste Agent" />
+<input type="hidden" name="poster" value="Django" />
+<textarea name="content" id="traceback_area" cols="140" rows="30" style="display: none;">
+{% spaceless %}
+Environment:
+Django Version: {{ django_version_info }}
+Python Version: {{ sys_version_info }}
+Installed Applications: 
+{{ settings.INSTALLED_APPS|pprint }}
+Installed Middleware: 
+{{ settings.MIDDLEWARE_CLASSES|pprint }}
+
+Traceback:
+{% for frame in frames %}
+File "{{ frame.filename|escape }}" in {{ frame.function|escape }}
+{% if frame.context_line %}{{ frame.lineno }}. {{ frame.context_line|escape }}{% endif %}
+{% endfor %}
+{{ exception_type|escape }} at {{ request.path|escape }}
+{{ exception_value|escape }}
+{% endspaceless %}
+</textarea>
+</form>
 </div>
 
 <div id="requestinfo">