Merge lp:~lifeless/python-oops-tools/bug-1048470 into lp:python-oops-tools

[Robert Collins]

This fixes handling of non-unicode pageids, which were stored OK in the DB, but broke HTML report rendering.

This fixes handling of non-unicode pageids, which were stored OK in the
DB, but broke HTML report rendering.

[John A Meinel (jameinel)]

Does what it says on the tin. Looks good to me.

review: Approve

[Launchpad PQM Bot (launchpad-pqm)]

The attempt to merge lp:~lifeless/python-oops-tools/bug-1048470 into lp:python-oops-tools failed.Below is the output from the failed tests.

find . -type f -name '*.py[co]' -exec rm -f {} \;
rm -f bin/buildout
rm -f src/oopstools/settings.py
bzr clean-tree --unknown --force
bzr up download-cache
python bootstrap.py \
  --setup-source=download-cache/ez_setup.py \
  --download-base=download-cache/dist --eggs=eggs
Download error: [Errno 111] Connection refused -- Some packages may not be found!
Download error: [Errno 111] Connection refused -- Some packages may not be found!
Generated script '/home/pqm/pqm-workdir/oops-tools/bin/buildout'.
bin/buildout configuration:db-port=5433
Develop: '/home/pqm/pqm-workdir/oops-tools/.'
Uninstalling filetemplates.
Updating scripts.
Installing filetemplates.
Updating django.
Updating docs.
Updating tags.
bin/test
Creating test database for alias 'default'...

W: line 4 [buildbot-staging]: Deprecated key 'location' used
I: This option will be removed in the future; please update your configuration
W: line 2 [pqm]: Deprecated key 'location' used
I: This option will be removed in the future; please update your configuration
W: line 3 [pqm-oops-tools]: Deprecated key 'location' used
I: This option will be removed in the future; please update your configuration
W: line 1 [precise]: Deprecated key 'location' used
I: This option will be removed in the future; please update your configuration
I: [pqm-oops-tools chroot] Running command: "cd /home/pqm/pqm-workdir/oops-tools && make check"
Nothing to delete.
+N dist/auditor-0.0.3.tar.gz
+N dist/auditorfixture-0.0.4.tar.gz
+N dist/auditorfixture-0.0.5.tar.gz
+N dist/mechanize-0.2.5.zip
+N dist/oops-0.0.13.tar.gz
+N dist/oops_amqp-0.0.7.tar.gz
+N dist/oops_datedir_repo-0.0.18.tar.gz
+N dist/pgbouncer-0.0.8.tar.gz
+N dist/python-debian-0.1.21.tar.gz
+N dist/python-openid-2.2.5-fix1034376.tar.gz
+N dist/python-subunit-0.0.8.tar.gz
+N dist/subvertpy-0.9.0.tar.gz
+N dist/testtools-0.9.15.tar.gz
+N dist/zope.app.testing-3.10.0.tar.gz
+N dist/zope.testbrowser-4.0.2.tar.gz
-D dist/auditor-0.0.1.tar.gz
-D dist/auditor-0.0.2.tar.gz
-D dist/auditorclient-0.0.1.tar.gz
-D dist/auditorfixture-0.0.1.tar.gz
-D dist/auditorfixture-0.0.2.tar.gz
-D dist/auditorfixture-0.0.3.tar.gz
All changes applied successfully.
Updated to revision 518 of branch http://bazaar.launchpad.net/~launchpad/lp-source-dependencies/trunk
Traceback (most recent call last):
  File "bin/test", line 55, in <module>
    djangorecipe.test.main('oopstools.settings', 'oopstools')
  File "/home/pqm/pqm-workdir/oops-tools/eggs/djangorecipe-0.19.2-py2.6.egg/djangorecipe/test.py", line 16, in main
    management.execute_manager(settings, argv=argv)
  File "/home/pqm/pqm-workdir/oops-tools/parts/django/django/core/management/__init__.py", line 438, in execute_manager
    utility.execute()
  File "/home/pqm/pqm-workdir/oops-tools/parts/django/django/core/management/__init__.py", line 379, in execute
    self.fetch_command(subcommand).run_from_argv(self.argv)
  File "/home/pqm/pqm-workdir/oops-tools/parts/django/django/core/management/base.py", line 191, in run_from_argv
    self.execute(*args, **options.__...

[Launchpad PQM Bot (launchpad-pqm)]

The attempt to merge lp:~lifeless/python-oops-tools/bug-1048470 into lp:python-oops-tools failed.Below is the output from the failed tests.

find . -type f -name '*.py[co]' -exec rm -f {} \;
rm -f bin/buildout
rm -f src/oopstools/settings.py
bzr clean-tree --unknown --force
bzr up download-cache
python bootstrap.py \
  --setup-source=download-cache/ez_setup.py \
  --download-base=download-cache/dist --eggs=eggs
Download error: [Errno 111] Connection refused -- Some packages may not be found!
Download error: [Errno 111] Connection refused -- Some packages may not be found!
Generated script '/home/pqm/pqm-workdir/oops-tools/bin/buildout'.
bin/buildout configuration:db-port=5433
Develop: '/home/pqm/pqm-workdir/oops-tools/.'
Uninstalling filetemplates.
Updating scripts.
Installing filetemplates.
Updating django.
Updating docs.
Updating tags.
bin/test
Creating test database for alias 'default'...

W: line 4 [buildbot-staging]: Deprecated key 'location' used
I: This option will be removed in the future; please update your configuration
W: line 2 [pqm]: Deprecated key 'location' used
I: This option will be removed in the future; please update your configuration
W: line 3 [pqm-oops-tools]: Deprecated key 'location' used
I: This option will be removed in the future; please update your configuration
W: line 1 [precise]: Deprecated key 'location' used
I: This option will be removed in the future; please update your configuration
I: [pqm-oops-tools chroot] Running command: "cd /home/pqm/pqm-workdir/oops-tools && make check"
Nothing to delete.
Tree is up to date at revision 518 of branch http://bazaar.launchpad.net/~launchpad/lp-source-dependencies/trunk
Traceback (most recent call last):
  File "bin/test", line 55, in <module>
    djangorecipe.test.main('oopstools.settings', 'oopstools')
  File "/home/pqm/pqm-workdir/oops-tools/eggs/djangorecipe-0.19.2-py2.6.egg/djangorecipe/test.py", line 16, in main
    management.execute_manager(settings, argv=argv)
  File "/home/pqm/pqm-workdir/oops-tools/parts/django/django/core/management/__init__.py", line 438, in execute_manager
    utility.execute()
  File "/home/pqm/pqm-workdir/oops-tools/parts/django/django/core/management/__init__.py", line 379, in execute
    self.fetch_command(subcommand).run_from_argv(self.argv)
  File "/home/pqm/pqm-workdir/oops-tools/parts/django/django/core/management/base.py", line 191, in run_from_argv
    self.execute(*args, **options.__dict__)
  File "/home/pqm/pqm-workdir/oops-tools/parts/django/django/core/management/base.py", line 220, in execute
    output = self.handle(*args, **options)
  File "/home/pqm/pqm-workdir/oops-tools/eggs/South-0.7.3_r929-py2.6.egg/south/management/commands/test.py", line 8, in handle
    super(Command, self).handle(*args, **kwargs)
  File "/home/pqm/pqm-workdir/oops-tools/parts/django/django/core/management/commands/test.py", line 37, in handle
    failures = test_runner.run_tests(test_labels)
  File "/home/pqm/pqm-workdir/oops-tools/parts/django/django/test/simple.py", line 359, in run_tests
    old_config = self.setup_databases()
  File "/home/pqm/pqm-workdir/oops-tools/parts/django/django/test/simple.py", line 296, in setup_databases
    test_db_n...

[lp:~lifeless/python-oops-tools/bug-1048470]

39. By Robert Collins on 2012-09-10

This fixes handling of non-unicode pageids, which were stored OK in the DB, but broke HTML report rendering.

=== modified file 'src/oopstools/NEWS.txt'
--- src/oopstools/NEWS.txt	2012-07-27 04:27:53 +0000
+++ src/oopstools/NEWS.txt	2012-09-10 05:30:26 +0000
@@ -8,6 +8,9 @@
 * Reports have a per-report email address that can be set, to allow different
   reports to go to different addresses. (Robert Collins)
 
+* HTML reports can be created for non-ascii OOPS topics.
+  (Robert Collins, #1048470)
+
 0.6.2
 =====
 

=== modified file 'src/oopstools/oops/dbsummaries.py'
--- src/oopstools/oops/dbsummaries.py	2011-12-15 12:38:18 +0000
+++ src/oopstools/oops/dbsummaries.py	2012-09-10 05:30:26 +0000
@@ -134,6 +134,7 @@
                 data['pageid'] = 'Unknown'
             if data['pageid'] == '':
                 data['pageid'] = 'Unknown'
+            data['pageid'] = _escape(data['pageid'])
             data['escaped_url'] = _escape(data['url'])
             data['errors'] = data['errors'].split(',')
             data['errors'].sort()
@@ -457,7 +458,8 @@
             fp.write('<td>%s</td>\n<td><a href="%s">%s</a></td>'
                      '\n<td>%s</td>\n' % (
                         self.field_format % value,
-                        get_absolute_url(oopsids[0]), oopsids[0], pageid))
+                        get_absolute_url(oopsids[0]), oopsids[0].encode('utf8'),
+                        _escape(pageid)))
             fp.write('</tr>\n')
         fp.write('</table>')
         fp.write('</div>')

=== modified file 'src/oopstools/oops/test/test_dbsummaries.py'
--- src/oopstools/oops/test/test_dbsummaries.py	2011-12-13 15:10:47 +0000
+++ src/oopstools/oops/test/test_dbsummaries.py	2012-09-10 05:30:26 +0000
@@ -36,6 +36,7 @@
             'type': 'Exception',
             'value': u'a unicode char (\xa7)',
             'time': datetime(2008, 1, 13, 23, 14, 23, 00, utc),
+            'topic': u'more unicode \xa7',
             }
         ignored = parsed_oops_to_model_oops(
             python_oops, 'test_unicode_handling')
@@ -53,3 +54,4 @@
         fp = StringIO()
         self.summary.renderHTML(fp)
         self.assertThat(fp.getvalue(), Contains('a unicode char (\xc2\xa7)'))
+        self.assertThat(fp.getvalue(), Contains('more unicode \xc2\xa7'))