Django

Code

Show
Ignore:
Timestamp:
12/14/07 19:38:43 (1 year ago)
Author:
jbronn
Message:

gis: Merged revisions 6672,6686-6688,6690,6693,6707-6708,6726,6730,6753,6755-6762,6764,6776-6777,6779,6782-6919 via svnmerge from trunk; reverted oracle backend base.py due to ikelly's patch in r6905.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/gis

    • Property svnmerge-integrated changed from /django/trunk:1-6671,6673-6781 to /django/trunk:1-6919

  • django/branches/gis/django/contrib/markup/tests.py

    r6672 r6920  
    6262        rendered = t.render(Context(locals())).strip() 
    6363        if docutils: 
    64             self.assertEqual(rendered, """<p>Paragraph 1</p> 
     64            # Different versions of docutils return slightly different HTML 
     65            try: 
     66                # Docutils v0.4 and earlier 
     67                self.assertEqual(rendered, """<p>Paragraph 1</p> 
    6568<p>Paragraph 2 with a <a class="reference" href="http://www.example.com/">link</a></p>""") 
     69            except AssertionError, e: 
     70                # Docutils from SVN (which will become 0.5) 
     71                self.assertEqual(rendered, """<p>Paragraph 1</p> 
     72<p>Paragraph 2 with a <a class="reference external" href="http://www.example.com/">link</a></p>""") 
    6673        else: 
    6774            self.assertEqual(rendered, rest_content)