Skip to content
Browse files

magic-removal: Merged to [2450]

git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@2451 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
1 parent 53ac6f9 commit e8cfcf28e669695dbb16faba55b5ec0fac0caf42 @adrianholovaty adrianholovaty committed Mar 1, 2006
View
8 django/contrib/admin/media/js/admin/RelatedObjectLookups.js
@@ -3,11 +3,11 @@
function showRelatedObjectLookupPopup(triggeringLink) {
var name = triggeringLink.id.replace(/^lookup_/, '');
- var href
+ var href;
if (triggeringLink.href.search(/\?/) >= 0) {
href = triggeringLink.href + '&pop=1';
} else {
- href = triggeringLink.href + '?pop=1'
+ href = triggeringLink.href + '?pop=1';
}
var win = window.open(href, name, 'height=500,width=740,resizable=yes,scrollbars=yes');
win.focus();
@@ -33,12 +33,12 @@ function showAddAnotherPopup(triggeringLink) {
}
function dismissAddAnotherPopup(win, newId, newRepr) {
- var name = win.name.replace(/___/g, '.')
+ var name = win.name.replace(/___/g, '.');
var elem = document.getElementById(name);
if (elem) {
if (elem.nodeName == 'SELECT') {
var o = new Option(newRepr, newId);
- elem.options[elem.options.length] = o
+ elem.options[elem.options.length] = o;
elem.selectedIndex = elem.length - 1;
} else if (elem.nodeName == 'INPUT') {
elem.value = newId;
View
24 django/contrib/admin/media/js/calendar.js
@@ -102,15 +102,17 @@ function Calendar(div_id, callback) {
this.today = new Date();
this.currentMonth = this.today.getMonth() + 1;
this.currentYear = this.today.getFullYear();
- this.drawCurrent = function() {
+}
+Calendar.prototype = {
+ drawCurrent: function() {
CalendarNamespace.draw(this.currentMonth, this.currentYear, this.div_id, this.callback);
- }
- this.drawDate = function(month, year) {
+ },
+ drawDate: function(month, year) {
this.currentMonth = month;
this.currentYear = year;
this.drawCurrent();
- }
- this.drawPreviousMonth = function() {
+ },
+ drawPreviousMonth: function() {
if (this.currentMonth == 1) {
this.currentMonth = 12;
this.currentYear--;
@@ -119,8 +121,8 @@ function Calendar(div_id, callback) {
this.currentMonth--;
}
this.drawCurrent();
- }
- this.drawNextMonth = function() {
+ },
+ drawNextMonth: function() {
if (this.currentMonth == 12) {
this.currentMonth = 1;
this.currentYear++;
@@ -129,12 +131,12 @@ function Calendar(div_id, callback) {
this.currentMonth++;
}
this.drawCurrent();
- }
- this.drawPreviousYear = function() {
+ },
+ drawPreviousYear: function() {
this.currentYear--;
this.drawCurrent();
- }
- this.drawNextYear = function() {
+ },
+ drawNextYear: function() {
this.currentYear++;
this.drawCurrent();
}
View
6 django/contrib/admin/media/js/core.js
@@ -70,7 +70,7 @@ function findPosX(obj) {
var curleft = 0;
if (obj.offsetParent) {
while (obj.offsetParent) {
- curleft += obj.offsetLeft
+ curleft += obj.offsetLeft;
obj = obj.offsetParent;
}
} else if (obj.x) {
@@ -83,7 +83,7 @@ function findPosY(obj) {
var curtop = 0;
if (obj.offsetParent) {
while (obj.offsetParent) {
- curtop += obj.offsetTop
+ curtop += obj.offsetTop;
obj = obj.offsetParent;
}
} else if (obj.y) {
@@ -130,7 +130,7 @@ Date.prototype.getHourMinute = function() {
// String object extensions
// ----------------------------------------------------------------------------
String.prototype.pad_left = function(pad_length, pad_string) {
- new_string = this;
+ var new_string = this;
for (var i = 0; new_string.length < pad_length; i++) {
new_string = pad_string + new_string;
}
View
36 django/contrib/admin/media/js/dateparse.js
@@ -4,24 +4,30 @@
*/
/* Finds the index of the first occurence of item in the array, or -1 if not found */
-Array.prototype.indexOf = function(item) {
- for (var i = 0; i < this.length; i++) {
- if (this[i] == item) {
- return i;
+if (typeof Array.prototype.indexOf == 'undefined') {
+ Array.prototype.indexOf = function(item) {
+ var len = this.length;
+ for (var i = 0; i < len; i++) {
+ if (this[i] == item) {
+ return i;
+ }
}
- }
- return -1;
-};
+ return -1;
+ };
+}
/* Returns an array of items judged 'true' by the passed in test function */
-Array.prototype.filter = function(test) {
- var matches = [];
- for (var i = 0; i < this.length; i++) {
- if (test(this[i])) {
- matches[matches.length] = this[i];
+if (typeof Array.prototype.filter == 'undefined') {
+ Array.prototype.filter = function(test) {
+ var matches = [];
+ var len = this.length;
+ for (var i = 0; i < len; i++) {
+ if (test(this[i])) {
+ matches[matches.length] = this[i];
+ }
}
- }
- return matches;
-};
+ return matches;
+ };
+}
var monthNames = gettext("January February March April May June July August September October November December").split(" ");
var weekdayNames = gettext("Sunday Monday Tuesday Wednesday Thursday Friday Saturday").split(" ");
View
3 django/db/backends/mysql/base.py
@@ -111,6 +111,9 @@ def get_date_trunc_sql(lookup_type, field_name):
# http://dev.mysql.com/doc/mysql/en/date-and-time-functions.html
# MySQL doesn't support DATE_TRUNC, so we fake it by subtracting intervals.
# If you know of a better way to do this, please file a Django ticket.
+ # Note that we can't use DATE_FORMAT directly because that causes the output
+ # to be a string rather than a datetime object, and we need MySQL to return
+ # a date so that it's typecasted properly into a Python datetime object.
subtractions = ["interval (DATE_FORMAT(%s, '%%%%s')) second - interval (DATE_FORMAT(%s, '%%%%i')) minute - interval (DATE_FORMAT(%s, '%%%%H')) hour" % (field_name, field_name, field_name)]
if lookup_type in ('year', 'month'):
subtractions.append(" - interval (DATE_FORMAT(%s, '%%%%e')-1) day" % field_name)
View
110 django/views/debug.py
@@ -255,6 +255,7 @@ def _get_lines_from_file(filename, lineno, context_lines):
hideAll(getElementsByClassName(document, 'table', 'vars'));
hideAll(getElementsByClassName(document, 'ol', 'pre-context'));
hideAll(getElementsByClassName(document, 'ol', 'post-context'));
+ hideAll(getElementsByClassName(document, 'div', 'pastebin'));
}
function toggle() {
for (var i = 0; i < arguments.length; i++) {
@@ -273,6 +274,13 @@ def _get_lines_from_file(filename, lineno, context_lines):
s.innerHTML = s.innerHTML == uarr ? darr : uarr;
return false;
}
+ function switchPastebinFriendly(link) {
+ s1 = "Switch to copy-and-paste view";
+ s2 = "Switch back to interactive view";
+ link.innerHTML = link.innerHTML == s1 ? s2 : s1;
+ toggle('browserTraceback', 'pastebinTraceback');
+ return false;
+ }
//-->
</script>
</head>
@@ -341,47 +349,71 @@ def _get_lines_from_file(filename, lineno, context_lines):
{% endif %}
<div id="traceback">
<h2>Traceback <span>(innermost last)</span></h2>
- <ul class="traceback">
- {% for frame in frames %}
- <li class="frame">
- <code>{{ frame.filename }}</code> in <code>{{ frame.function }}</code>
-
- {% if frame.context_line %}
- <div class="context" id="c{{ frame.id }}">
- {% if frame.pre_context %}
- <ol start="{{ frame.pre_context_lineno|add:"1" }}" 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|add:"1" }}" class="context-line"><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:"2" }}' 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 %}
- </div>
- {% endif %}
-
- {% if frame.vars %}
- <div class="commands">
- <a href="#" onclick="return varToggle(this, '{{ frame.id }}')"><span>&#x25b6;</span> Local vars</a>
- </div>
- <table class="vars" id="v{{ frame.id }}">
- <thead>
- <tr>
- <th>Variable</th>
- <th>Value</th>
- </tr>
- </thead>
- <tbody>
- {% for var in frame.vars|dictsort:"0" %}
+ <div class="commands"><a href="#" onclick="return switchPastebinFriendly(this);">Switch to copy-and-paste view</a></div>
+ <br/>
+ <div id="browserTraceback">
+ <ul class="traceback">
+ {% for frame in frames %}
+ <li class="frame">
+ <code>{{ frame.filename }}</code> in <code>{{ frame.function }}</code>
+
+ {% if frame.context_line %}
+ <div class="context" id="c{{ frame.id }}">
+ {% if frame.pre_context %}
+ <ol start="{{ frame.pre_context_lineno|add:"1" }}" 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|add:"1" }}" class="context-line"><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:"2" }}' 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 %}
+ </div>
+ {% endif %}
+
+ {% if frame.vars %}
+ <div class="commands">
+ <a href="#" onclick="return varToggle(this, '{{ frame.id }}')"><span>&#x25b6;</span> Local vars</a>
+ </div>
+ <table class="vars" id="v{{ frame.id }}">
+ <thead>
<tr>
- <td>{{ var.0 }}</td>
- <td class="code"><div>{{ var.1|pprint|escape }}</div></td>
+ <th>Variable</th>
+ <th>Value</th>
</tr>
- {% endfor %}
- </tbody>
- </table>
- {% endif %}
- </li>
- {% endfor %}
- </ul>
+ </thead>
+ <tbody>
+ {% for var in frame.vars|dictsort:"0" %}
+ <tr>
+ <td>{{ var.0 }}</td>
+ <td class="code"><div>{{ var.1|pprint|escape }}</div></td>
+ </tr>
+ {% endfor %}
+ </tbody>
+ </table>
+ {% endif %}
+ </li>
+ {% endfor %}
+ </ul>
+ </div>
+ <div id="pastebinTraceback" class="pastebin">
+ <table>
+ <tbody>
+ <tr>
+ <td>
+ <code>
+Traceback (most recent call last):<br/>
+{% for frame in frames %}
+ File "{{ frame.filename }}" in {{ frame.function }}<br/>
+ {% if frame.context_line %}
+ &nbsp;&nbsp;{{ frame.lineno|add:"1" }}. {{ frame.context_line|escape }}<br/>
+ {% endif %}
+{% endfor %}<br/>
+&nbsp;&nbsp;{{ exception_type }} at {{ request.path }}<br/>
+&nbsp;&nbsp;{{ exception_value|escape }}</code>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
</div>
<div id="requestinfo">
View
14 ez_setup.py
@@ -14,14 +14,18 @@
This file can also be run as a script to install or upgrade setuptools.
"""
import sys
-DEFAULT_VERSION = "0.6a9"
+DEFAULT_VERSION = "0.6a10"
DEFAULT_URL = "http://cheeseshop.python.org/packages/%s/s/setuptools/" % sys.version[:3]
md5_data = {
'setuptools-0.5a13-py2.3.egg': '85edcf0ef39bab66e130d3f38f578c86',
'setuptools-0.5a13-py2.4.egg': 'ede4be600e3890e06d4ee5e0148e092a',
'setuptools-0.6a1-py2.3.egg': 'ee819a13b924d9696b0d6ca6d1c5833d',
'setuptools-0.6a1-py2.4.egg': '8256b5f1cd9e348ea6877b5ddd56257d',
+ 'setuptools-0.6a10-py2.3.egg': '162d8357f1aff2b0349c6c247ee62987',
+ 'setuptools-0.6a10-py2.4.egg': '803a2d8db501c1ac3b5b6fb4e907f788',
+ 'setuptools-0.6a10dev_r42346-py2.3.egg': 'a7899272cfceb6aa60094ae8928b8077',
+ 'setuptools-0.6a10dev_r42346-py2.4.egg': '5d42a64adca9aedb409f83ecf22156a5',
'setuptools-0.6a2-py2.3.egg': 'b98da449da411267c37a738f0ab625ba',
'setuptools-0.6a2-py2.4.egg': 'be5b88bc30aed63fdefd2683be135c3b',
'setuptools-0.6a3-py2.3.egg': 'ee0e325de78f23aab79d33106dc2a8c8',
@@ -123,8 +127,14 @@ def download_setuptools(
%s), but
you may need to enable firewall access for this script first.
I will start the download in %d seconds.
+
+(Note: if this machine does not have network access, please obtain the file
+
+ %s
+
+and place it in this directory before rerunning this script.)
---------------------------------------------------------------------------""",
- version, download_base, delay
+ version, download_base, delay, url
); from time import sleep; sleep(delay)
log.warn("Downloading %s", url)
src = urllib2.urlopen(url)

0 comments on commit e8cfcf2

Please sign in to comment.
Something went wrong with that request. Please try again.