Re: [Django] #10060: Multiple table annotation failure

2010-07-25 Thread Django
#10060: Multiple table annotation failure
--+-
  Reporter:  svsha...@intellecap.net  | Owner: 
Status:  new  | Milestone: 
 Component:  ORM aggregation  |   Version:  SVN
Resolution:   |  Keywords: 
 Stage:  Accepted | Has_patch:  0  
Needs_docs:  0|   Needs_tests:  0  
Needs_better_patch:  0|  
--+-
Changes (by mp):

 * cc: mpj...@terreon.de (added)

-- 
Ticket URL: 
Django 
The Web framework for perfectionists with deadlines.

-- 
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to django-upda...@googlegroups.com.
To unsubscribe from this group, send email to 
django-updates+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en.



Re: [Django] #14000: Removal of obsolete "versionadded" tags

2010-07-25 Thread Django
#14000: Removal of obsolete "versionadded" tags
+---
  Reporter:  richardb   | Owner:  nobody  
Status:  new| Milestone:  
 Component:  Documentation  |   Version:  SVN 
Resolution: |  Keywords:  versionadded
 Stage:  Unreviewed | Has_patch:  1   
Needs_docs:  0  |   Needs_tests:  0   
Needs_better_patch:  0  |  
+---
Comment (by ramiro):

 I'm testing an script that automatize this kind of replacements using some
 old code I used when working on the translation of the Django book.
 Figured it'd be an useful addition to the toolbox located in `docs/_ext/`
 so it can be used to do the grunt part of the work not only now but on
 future releases (e.g. run it with a `'1.1'` command line argument before
 Django 1.4 is released *).

 So far, it does this when removing `'.. version(added|changed):: 1.0'`
 stuff:
 {{{
  howto/custom-management-commands.txt  |2 --
  howto/custom-model-fields.txt |1 -
  howto/custom-template-tags.txt|5 -
  howto/deployment/modpython.txt|1 -
  ref/contrib/flatpages.txt |2 --
  ref/contrib/formtools/form-wizard.txt |2 --
  ref/contrib/gis/index.txt |2 --
  ref/contrib/humanize.txt  |2 --
  ref/contrib/index.txt |1 -
  ref/contrib/sitemaps.txt  |2 --
  ref/contrib/sites.txt |4 
  ref/databases.txt |2 --
  ref/django-admin.txt  |   10 --
  ref/forms/api.txt |3 ---
  ref/forms/fields.txt  |   12 
  ref/forms/widgets.txt |2 --
  ref/generic-views.txt |8 
  ref/middleware.txt|3 ---
  ref/models/fields.txt |   15 ---
  ref/models/instances.txt  |5 -
  ref/models/options.txt|4 
  ref/models/querysets.txt  |   23 ---
  ref/request-response.txt  |   14 --
  ref/settings.txt  |   30
 --
  ref/templates/api.txt |2 --
  ref/templates/builtins.txt|   20 
  ref/unicode.txt   |2 --
  releases/1.0.txt  |1 -
  topics/auth.txt   |7 ---
  topics/cache.txt  |9 -
  topics/db/models.txt  |8 
  topics/db/queries.txt |4 
  topics/email.txt  |2 --
  topics/files.txt  |2 --
  topics/forms/index.txt|1 -
  topics/forms/modelforms.txt   |2 --
  topics/http/file-uploads.txt  |2 --
  topics/http/sessions.txt  |   23 ---
  topics/http/shortcuts.txt |2 --
  topics/http/urls.txt  |4 
  topics/i18n/deployment.txt|2 --
  topics/pagination.txt |3 ---
  topics/templates.txt  |2 --
  topics/testing.txt|   18 --
  44 files changed, 271 deletions(-)
 }}}

 Visual inspection shows additional 31 hand editions are needed after this
 as well to remove paragraphs that talk about the changes in 1.0 and are
 left orphan.

 Will upload it once I clean it up a bit.

 * I suspect I have my numbers mixed/shifted here because now 1.2 has been
 released, the window of supported releases would be 1.2 and 1.1 so we
 would need to have removed all the `'version(added|changed): 1.0'` notes
 in the 1.2 docs and would need to do the same with the notes for 1.1
 before 1.3 gets released.

 But I suspect core devs won't want to make such an invasive modification
 to the docs on the 1.2.x branch at this point (although OTOH doing so
 would the risk of conflicts when backporting doc patches from trunk).

-- 
Ticket URL: 
Django 
The Web framework for perfectionists with deadlines.

-- 
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to django-upda...@googlegroups.com.
To unsubscribe from this group, send email to 
django-updates+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en.



[Changeset] r13448 - in django/branches/releases/1.2.X/docs: . _ext internals

2010-07-25 Thread noreply
Author: jezdez
Date: 2010-07-25 15:58:58 -0500 (Sun, 25 Jul 2010)
New Revision: 13448

Removed:
   django/branches/releases/1.2.X/docs/_static/
   django/branches/releases/1.2.X/docs/_templates/
Modified:
   django/branches/releases/1.2.X/docs/_ext/djangodocs.py
   django/branches/releases/1.2.X/docs/conf.py
   django/branches/releases/1.2.X/docs/internals/documentation.txt
Log:
[1.2.X] Fixed #14005 - Removed a few unneeded workarounds in the Sphinx 
extension. Thanks for the report and patch, Ramiro Morales.

Backport of r13447 from trunk.



Modified: django/branches/releases/1.2.X/docs/_ext/djangodocs.py
===
--- django/branches/releases/1.2.X/docs/_ext/djangodocs.py  2010-07-25 
20:39:40 UTC (rev 13447)
+++ django/branches/releases/1.2.X/docs/_ext/djangodocs.py  2010-07-25 
20:58:58 UTC (rev 13448)
@@ -1,9 +1,9 @@
 """
 Sphinx plugins for Django documentation.
 """
+import os
 
-import docutils.nodes
-import docutils.transforms
+from docutils import nodes, transforms
 try:
 import json
 except ImportError:
@@ -14,27 +14,13 @@
 from django.utils import simplejson as json
 except ImportError:
 json = None
-import os
-import sphinx
-import sphinx.addnodes
-try:
-from sphinx import builders
-except ImportError:
-import sphinx.builder as builders
-try:
-import sphinx.builders.html as builders_html
-except ImportError:
-builders_html = builders
+
+from sphinx import addnodes, roles
+from sphinx.builders.html import StandaloneHTMLBuilder
+from sphinx.writers.html import SmartyPantsHTMLTranslator
 from sphinx.util.console import bold
-import sphinx.directives
-import sphinx.environment
-try:
-import sphinx.writers.html as sphinx_htmlwriter
-except ImportError:
-import sphinx.htmlwriter as sphinx_htmlwriter
-import sphinx.roles
-from docutils import nodes
 
+
 def setup(app):
 app.add_crossref_type(
 directivename = "setting",
@@ -74,24 +60,20 @@
 app.add_transform(SuppressBlockquotes)
 app.add_builder(DjangoStandaloneHTMLBuilder)
 
-# Monkeypatch PickleHTMLBuilder so that it doesn't die in Sphinx 0.4.2
-if sphinx.__version__ == '0.4.2':
-monkeypatch_pickle_builder()
-
 def parse_version_directive(name, arguments, options, content, lineno,
   content_offset, block_text, state, state_machine):
 env = state.document.settings.env
 is_nextversion = env.config.django_next_version == arguments[0]
 ret = []
-node = sphinx.addnodes.versionmodified()
+node = addnodes.versionmodified()
 ret.append(node)
 if not is_nextversion:
 if len(arguments) == 1:
 linktext = 'Please, see the release notes ' % 
(arguments[0])
 try:
-xrefs = sphinx.roles.XRefRole()('ref', linktext, linktext, 
lineno, state) # Sphinx >= 1.0
+xrefs = roles.XRefRole()('ref', linktext, linktext, lineno, 
state) # Sphinx >= 1.0
 except:
-xrefs = sphinx.roles.xfileref_role('ref', linktext, linktext, 
lineno, state) # Sphinx < 1.0
+xrefs = roles.xfileref_role('ref', linktext, linktext, lineno, 
state) # Sphinx < 1.0
 node.extend(xrefs[0])
 node['version'] = arguments[0]
 else:
@@ -106,29 +88,29 @@
 env.note_versionchange(node['type'], node['version'], node, lineno)
 return ret
 
-
-class SuppressBlockquotes(docutils.transforms.Transform):
+
+class SuppressBlockquotes(transforms.Transform):
 """
 Remove the default blockquotes that encase indented list, tables, etc.
 """
 default_priority = 300
-
+
 suppress_blockquote_child_nodes = (
-docutils.nodes.bullet_list, 
-docutils.nodes.enumerated_list, 
-docutils.nodes.definition_list,
-docutils.nodes.literal_block, 
-docutils.nodes.doctest_block, 
-docutils.nodes.line_block, 
-docutils.nodes.table
+nodes.bullet_list,
+nodes.enumerated_list,
+nodes.definition_list,
+nodes.literal_block,
+nodes.doctest_block,
+nodes.line_block,
+nodes.table
 )
-
+
 def apply(self):
-for node in self.document.traverse(docutils.nodes.block_quote):
+for node in self.document.traverse(nodes.block_quote):
 if len(node.children) == 1 and isinstance(node.children[0], 
self.suppress_blockquote_child_nodes):
 node.replace_self(node.children[0])
 
-class DjangoHTMLTranslator(sphinx_htmlwriter.SmartyPantsHTMLTranslator):
+class DjangoHTMLTranslator(SmartyPantsHTMLTranslator):
 """
 Django-specific reST to HTML tweaks.
 """
@@ -136,42 +118,41 @@
 # Don't use border=1, which docutils does by default.
 def visit_table(self, node):
 self.body.append(self.starttag(node, 'table', CLASS='docutils'))
-
+
 # ? Really?
 def 

[Changeset] r13447 - in django/trunk/docs: . _ext internals

2010-07-25 Thread noreply
Author: jezdez
Date: 2010-07-25 15:39:40 -0500 (Sun, 25 Jul 2010)
New Revision: 13447

Removed:
   django/trunk/docs/_static/
   django/trunk/docs/_templates/
Modified:
   django/trunk/docs/_ext/djangodocs.py
   django/trunk/docs/conf.py
   django/trunk/docs/internals/documentation.txt
Log:
Fixed #14005 - Removed a few unneeded workarounds in the Sphinx extension. 
Thanks for the report and patch, Ramiro Morales.



Modified: django/trunk/docs/_ext/djangodocs.py
===
--- django/trunk/docs/_ext/djangodocs.py2010-07-24 10:21:21 UTC (rev 
13446)
+++ django/trunk/docs/_ext/djangodocs.py2010-07-25 20:39:40 UTC (rev 
13447)
@@ -1,9 +1,9 @@
 """
 Sphinx plugins for Django documentation.
 """
+import os
 
-import docutils.nodes
-import docutils.transforms
+from docutils import nodes, transforms
 try:
 import json
 except ImportError:
@@ -14,27 +14,13 @@
 from django.utils import simplejson as json
 except ImportError:
 json = None
-import os
-import sphinx
-import sphinx.addnodes
-try:
-from sphinx import builders
-except ImportError:
-import sphinx.builder as builders
-try:
-import sphinx.builders.html as builders_html
-except ImportError:
-builders_html = builders
+
+from sphinx import addnodes, roles
+from sphinx.builders.html import StandaloneHTMLBuilder
+from sphinx.writers.html import SmartyPantsHTMLTranslator
 from sphinx.util.console import bold
-import sphinx.directives
-import sphinx.environment
-try:
-import sphinx.writers.html as sphinx_htmlwriter
-except ImportError:
-import sphinx.htmlwriter as sphinx_htmlwriter
-import sphinx.roles
-from docutils import nodes
 
+
 def setup(app):
 app.add_crossref_type(
 directivename = "setting",
@@ -74,24 +60,20 @@
 app.add_transform(SuppressBlockquotes)
 app.add_builder(DjangoStandaloneHTMLBuilder)
 
-# Monkeypatch PickleHTMLBuilder so that it doesn't die in Sphinx 0.4.2
-if sphinx.__version__ == '0.4.2':
-monkeypatch_pickle_builder()
-
 def parse_version_directive(name, arguments, options, content, lineno,
   content_offset, block_text, state, state_machine):
 env = state.document.settings.env
 is_nextversion = env.config.django_next_version == arguments[0]
 ret = []
-node = sphinx.addnodes.versionmodified()
+node = addnodes.versionmodified()
 ret.append(node)
 if not is_nextversion:
 if len(arguments) == 1:
 linktext = 'Please, see the release notes ' % 
(arguments[0])
 try:
-xrefs = sphinx.roles.XRefRole()('ref', linktext, linktext, 
lineno, state) # Sphinx >= 1.0
+xrefs = roles.XRefRole()('ref', linktext, linktext, lineno, 
state) # Sphinx >= 1.0
 except:
-xrefs = sphinx.roles.xfileref_role('ref', linktext, linktext, 
lineno, state) # Sphinx < 1.0
+xrefs = roles.xfileref_role('ref', linktext, linktext, lineno, 
state) # Sphinx < 1.0
 node.extend(xrefs[0])
 node['version'] = arguments[0]
 else:
@@ -106,29 +88,29 @@
 env.note_versionchange(node['type'], node['version'], node, lineno)
 return ret
 
-
-class SuppressBlockquotes(docutils.transforms.Transform):
+
+class SuppressBlockquotes(transforms.Transform):
 """
 Remove the default blockquotes that encase indented list, tables, etc.
 """
 default_priority = 300
-
+
 suppress_blockquote_child_nodes = (
-docutils.nodes.bullet_list, 
-docutils.nodes.enumerated_list, 
-docutils.nodes.definition_list,
-docutils.nodes.literal_block, 
-docutils.nodes.doctest_block, 
-docutils.nodes.line_block, 
-docutils.nodes.table
+nodes.bullet_list,
+nodes.enumerated_list,
+nodes.definition_list,
+nodes.literal_block,
+nodes.doctest_block,
+nodes.line_block,
+nodes.table
 )
-
+
 def apply(self):
-for node in self.document.traverse(docutils.nodes.block_quote):
+for node in self.document.traverse(nodes.block_quote):
 if len(node.children) == 1 and isinstance(node.children[0], 
self.suppress_blockquote_child_nodes):
 node.replace_self(node.children[0])
 
-class DjangoHTMLTranslator(sphinx_htmlwriter.SmartyPantsHTMLTranslator):
+class DjangoHTMLTranslator(SmartyPantsHTMLTranslator):
 """
 Django-specific reST to HTML tweaks.
 """
@@ -136,42 +118,41 @@
 # Don't use border=1, which docutils does by default.
 def visit_table(self, node):
 self.body.append(self.starttag(node, 'table', CLASS='docutils'))
-
+
 # ? Really?
 def visit_desc_parameterlist(self, node):
 self.body.append('(')
 self.first_param = 1
-
+
 def depart_desc_parameterlist(self, node):
 self.body.append(')')
-pass
-

Re: [Django] #6932: Flatpages does not provide a list of available flat pages to the context

2010-07-25 Thread Django
#6932: Flatpages does not provide a list of available flat pages to the context
--+-
  Reporter:  Dmitri Fedortchenko   | Owner:  
faldridge 
Status:  new  | Milestone:  
  
 Component:  Contrib apps |   Version:  
SVN   
Resolution:   |  Keywords:  
flatpages list templatetag
 Stage:  Ready for checkin| Has_patch:  
1 
Needs_docs:  0|   Needs_tests:  
0 
Needs_better_patch:  0|  
--+-
Changes (by justinlilly):

  * stage:  Accepted => Ready for checkin

Comment:

 Appears to adhere to what Jacob wanted as well as providing the necessary
 docs + tests. Applies cleanly to trunk and tests pass for sqlite.

-- 
Ticket URL: 
Django 
The Web framework for perfectionists with deadlines.

-- 
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to django-upda...@googlegroups.com.
To unsubscribe from this group, send email to 
django-updates+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en.



[Django] #14005: Remove hacks for compatibility with old versions of Sphinx

2010-07-25 Thread Django
#14005: Remove hacks for compatibility with old versions of Sphinx
---+
 Reporter:  ramiro |   Owner:  nobody
   Status:  new|   Milestone:
Component:  Documentation  | Version:  SVN   
 Keywords: |   Stage:  Unreviewed
Has_patch:  1  |  
---+
 Now that we've revamped the Django docs infrastructure to make use of just
 released Sphinx 1.0 we can remove some we have on
 `docs/_ext/djangodocs.py`. On IRC, Jannis voted for keeping compatibility
 with 0.6.x.

-- 
Ticket URL: 
Django 
The Web framework for perfectionists with deadlines.

-- 
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to django-upda...@googlegroups.com.
To unsubscribe from this group, send email to 
django-updates+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en.



Re: [Django] #7936: Add Last-Modified header to feeds

2010-07-25 Thread Django
#7936: Add Last-Modified header to feeds
+---
  Reporter:  julianb| Owner:   
Status:  new| Milestone:   
 Component:  RSS framework  |   Version:  1.2-alpha
Resolution: |  Keywords:  syndication last-modified
 Stage:  Accepted   | Has_patch:  1
Needs_docs:  0  |   Needs_tests:  0
Needs_better_patch:  0  |  
+---
Changes (by julianb):

  * owner:  julianb =>
  * status:  assigned => new

-- 
Ticket URL: 
Django 
The Web framework for perfectionists with deadlines.

-- 
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to django-upda...@googlegroups.com.
To unsubscribe from this group, send email to 
django-updates+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en.



Re: [Django] #13987: Primary key not set correctly for concrete->abstract->concrete model inheritance.

2010-07-25 Thread Django
#13987: Primary key not set correctly for concrete->abstract->concrete model
inheritance.
---+
  Reporter:  Aramgutang| Owner:  nobody 
   
Status:  new   | Milestone:  1.3
   
 Component:  Database layer (models, ORM)  |   Version:  1.2
   
Resolution:|  Keywords:  
inheritance, abstract, primary key
 Stage:  Unreviewed| Has_patch:  1  
   
Needs_docs:  0 |   Needs_tests:  0  
   
Needs_better_patch:  0 |  
---+
Changes (by Aramgutang):

  * needs_better_patch:  => 0
  * needs_tests:  => 0
  * needs_docs:  => 0

Comment:

 After doing some testing, it seems that the 1st variant of the fix breaks
 some tests, so I've attached a new diff that includes the 2nd variant of
 the fix (which doesn't break anything), along with regression tests for
 this bug.

-- 
Ticket URL: 
Django 
The Web framework for perfectionists with deadlines.

-- 
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to django-upda...@googlegroups.com.
To unsubscribe from this group, send email to 
django-updates+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en.



[Django] #14004: update() is not mention in the Queryset API Reference

2010-07-25 Thread Django
#14004: update() is not mention in the Queryset API Reference
---+
 Reporter:  anonymous  |   Owner:  nobody
   Status:  new|   Milestone:
Component:  Documentation  | Version:  1.2   
 Keywords: |   Stage:  Unreviewed
Has_patch:  0  |  
---+
 The very useful update() method of querysets found no mentioning in the
 Queryset API Reference
 (http://docs.djangoproject.com/en/dev/ref/models/querysets/).
 That cost me a lot of searching.

-- 
Ticket URL: 
Django 
The Web framework for perfectionists with deadlines.

-- 
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to django-upda...@googlegroups.com.
To unsubscribe from this group, send email to 
django-updates+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en.