Navigation

Changeset 5194

Timestamp:

05/11/07 11:03:48 (2 years ago)

Author:

bouldersprinters

Message:

boulder-oracle-sprint: Merged to [5193]

Files:

r3827	r5194
47	47	#: contrib/admin/media/js/calendar.js:24
48	48	msgid "January February March April May June July August September October November December"
49		msgstr "一月二月三月四月五月六月六月七月八月九月十月十一月十二月"
	49	msgstr "一月二月三月四月五月六月七月八月九月十月十一月十二月"
50	50
51	51	#: contrib/admin/media/js/dateparse.js:33

django/branches/boulder-oracle-sprint/django/conf/locale/zh_CN/LC_MESSAGES/django.po

r3827 r5194

1345 1345 #: utils/dates.py:19
1346 1346 msgid "may"
1347 msgstr "三月"
1347 msgstr "五月"
1348 1348
1349 1349 #: utils/dates.py:19
django/branches/boulder-oracle-sprint/django/contrib/webdesign/__init__.py
- Property svn:eol-style set to native

r4906	r5194
60	60	c = len(word_list)
61	61	if count > c:
62		count = min(count - c, len(WORDS))
63		word_list += random.sample(WORDS, count - c)
	62	count -= c
	63	while count > 0:
	64	c = min(count, len(WORDS))
	65	count -= c
	66	word_list += random.sample(WORDS, c)
64	67	else:
65	68	word_list = word_list[:count]

django/branches/boulder-oracle-sprint/django/contrib/webdesign/templatetags/__init__.py
- Property svn:eol-style set to native
django/branches/boulder-oracle-sprint/django/contrib/webdesign/templatetags/webdesign.py
- Property svn:eol-style set to native

r5100	r5194
92	92	MultiValueDict.__setitem__(self, key, value)
93	93
	94	def __delitem__(self, key):
	95	self._assert_mutable()
	96	super(QueryDict, self).__delitem__(key)
	97
94	98	def __copy__(self):
95	99	result = self.__class__('', mutable=True)

r5100	r5194
57	57
58	58	If you're on Windows, check out the unofficial `compiled Windows version`_.
59
	59
60	60	* If you're using MySQL, you'll need MySQLdb_, version 1.2.1p2 or higher.
61	61	You will also want to read the database-specific notes for the `MySQL backend`_.
…	…
79	79	=================================
80	80
81		If you are upgrading your installation of Django from a previous version,
82		you will need to uninstall the old Django version before installing the
83		new version.
	81	If you are upgrading your installation of Django from a previous version,
	82	you will need to uninstall the old Django version before installing the
	83	new version.
84	84
85	85	If you installed Django using ``setup.py install``, uninstalling
86		is as simple as deleting the ``django`` directory from your Python
	86	is as simple as deleting the ``django`` directory from your Python
87	87	``site-packages``.
88	88
89		If you installed Django from a Python Egg, remove the Django ``.egg` file,
90		and remove the reference to the egg in the file named ``easy-install.pth``.
	89	If you installed Django from a Python Egg, remove the Django ``.egg`` file,
	90	and remove the reference to the egg in the file named ``easy-install.pth``.
91	91	This file should also be located in your ``site-packages`` directory.
92	92
…	…
96	96	system, and the location in which Python was installed. However, the
97	97	following locations are common:
98
	98
99	99	* If you're using Linux: ``/usr/lib/python2.X/site-packages``
100	100

r5174	r5194
718	718	tag_name, format_string = token.split_contents()
719	719	except ValueError:
720		raise template.TemplateSyntaxError, "%r tag requires a single argument" % token.contents[0]
	720	raise template.TemplateSyntaxError, "%r tag requires a single argument" % token.contents.split()[0]
721	721	if not (format_string[0] == format_string[-1] and format_string[0] in ('"', "'")):
722	722	raise template.TemplateSyntaxError, "%r tag's argument should be in quotes" % tag_name
…	…
847	847	tag_name, date_to_be_formatted, format_string = token.split_contents()
848	848	except ValueError:
849		raise template.TemplateSyntaxError, "%r tag requires exactly two arguments" % token.contents[0]
	849	raise template.TemplateSyntaxError, "%r tag requires exactly two arguments" % token.contents.split()[0]
850	850	if not (format_string[0] == format_string[-1] and format_string[0] in ('"', "'")):
851	851	raise template.TemplateSyntaxError, "%r tag's argument should be in quotes" % tag_name
…	…
1081	1081	tag_name, arg = token.contents.split(None, 1)
1082	1082	except ValueError:
1083		raise template.TemplateSyntaxError, "%r tag requires arguments" % token.contents[0]
	1083	raise template.TemplateSyntaxError, "%r tag requires arguments" % token.contents.split()[0]
1084	1084	m = re.search(r'(.*?) as (\w+)', arg)
1085	1085	if not m:

r5100	r5194
97	97	'john'
98	98
	99	>>> del q['name']
	100	>>> 'name' in q
	101	False
	102
	103	>>> q['name'] = 'john'
	104
99	105	>>> q.get('foo', 'default')
100	106	'default'
…	…
368	374	'vote=yes&vote=no'
369	375
	376	>>> del q['vote']
	377	Traceback (most recent call last):
	378	...
	379	AttributeError: This QueryDict instance is immutable
	380
370	381	"""
371	382