Ibid

Merge lp:~keegan-csmith/ibid/jinja2-517784 into lp:ibid

  1. jinja2-517784
  2. Merge into trunk
Proposed by Keegan Carruthers-Smith
Status: Merged
Approved by: Stefano Rivera
Approved revision: 1033
Merged at revision: 1037
Proposed branch: lp:~keegan-csmith/ibid/jinja2-517784
Merge into: lp:ibid
Diff against target: 74 lines (+7/-6)
4 files modified
INSTALL (+1/-1)
docs/install.rst (+2/-2)
ibid/source/http.py (+3/-2)
setup.py (+1/-1)
To merge this branch: bzr merge lp:~keegan-csmith/ibid/jinja2-517784
Reviewer Review Type Date Requested Status
Stefano Rivera Approve
Jonathan Hitchcock Approve
Max Rabkin Approve
Review via email: mp+71326@code.launchpad.net

Commit message

Switched from Jinja to Jinja2

To post a comment you must log in.
Revision history for this message
Stefano Rivera (stefanor) wrote :

Yay, about time

review: Approve
Revision history for this message
Max Rabkin (max-rabkin) wrote :

This approval is based on Stefano telling me it's trivial :)

review: Approve
Revision history for this message
Ibid Branch Auto-Lander (ibid-tarmac) wrote :
Download full text (23.5 KiB)

The attempt to merge lp:~keegan-csmith/ibid/jinja2-517784 into lp:ibid failed. Below is the output from the failed tests.

ibid.test.plugins.test_calc
  CalcTest
    test_basic ... [OK]
    test_too_big ... [OK]
ibid.test.plugins.test_conversions
  UnihanTest
    test_simp_trad ... [OK]
/usr/lib/pymodules/python2.6/html5lib/treebuilders/soup.py:3: DeprecationWarning: BeautifulSoup 3.x (as of 3.1) is not fully compatible with html5lib and support will be removed in the future
/usr/lib/pymodules/python2.6/html5lib/treebuilders/soup.py:141: DataLossWarning: BeautifulSoup cannot represent elements in any namespace
/usr/lib/pymodules/python2.6/html5lib/treebuilders/soup.py:163: DataLossWarning: BeautifulSoup cannot represent elements in any namespace
ibid.test.plugins.test_core
  TestAddressed
    test_happy_prefix_names ... [OK]
    test_happy_suffix_names ... [OK]
    test_non_messages ... [OK]
    test_sad_prefix_names ... [OK]
    test_sad_suffix_names ... [OK]
    test_strip_punct ... [OK]
ibid.test.plugins.test_factoid
  FactoidTest
    test_also ... [FAIL]
    test_append ... [FAIL]
    test_duplicate_names ... [FAIL]
    test_empty ... [FAIL]
    test_forget_multiple ... [FAIL]
    test_forget_wildcard ... [OK]
    test_get_case ... [FAIL]
    test_modify_nothing ... [OK]
    test_multiple_copula ... [FAIL]
    test_name_punctuation ... [FAIL]
    test_same_as_nothing ... [OK]
    test_search_case ... [FAIL]
    test_search_unescape ... [FAIL]
    test_string_replace ... [FAIL]
    test_string_transliterate ... [FAIL]
    test_unicode_name ... [FAIL]
    test_wildcard_tamecard ... [FAIL]
ibid.test.plugins.test_google
  GDefineTest
    test_basic ... [OK]
    test_unicode_latin ... [OK]
ibid.test.plugins.test_url
  TestURLGrabber
    test_bad_grabs ... [OK]
    test_good_grabs ... ...

Revision history for this message
Ibid Branch Auto-Lander (ibid-tarmac) wrote :
Download full text (23.5 KiB)

The attempt to merge lp:~keegan-csmith/ibid/jinja2-517784 into lp:ibid failed. Below is the output from the failed tests.

ibid.test.plugins.test_calc
  CalcTest
    test_basic ... [OK]
    test_too_big ... [OK]
ibid.test.plugins.test_conversions
  UnihanTest
    test_simp_trad ... [OK]
/usr/lib/pymodules/python2.6/html5lib/treebuilders/soup.py:3: DeprecationWarning: BeautifulSoup 3.x (as of 3.1) is not fully compatible with html5lib and support will be removed in the future
/usr/lib/pymodules/python2.6/html5lib/treebuilders/soup.py:141: DataLossWarning: BeautifulSoup cannot represent elements in any namespace
/usr/lib/pymodules/python2.6/html5lib/treebuilders/soup.py:163: DataLossWarning: BeautifulSoup cannot represent elements in any namespace
ibid.test.plugins.test_core
  TestAddressed
    test_happy_prefix_names ... [OK]
    test_happy_suffix_names ... [OK]
    test_non_messages ... [OK]
    test_sad_prefix_names ... [OK]
    test_sad_suffix_names ... [OK]
    test_strip_punct ... [OK]
ibid.test.plugins.test_factoid
  FactoidTest
    test_also ... [FAIL]
    test_append ... [FAIL]
    test_duplicate_names ... [FAIL]
    test_empty ... [FAIL]
    test_forget_multiple ... [FAIL]
    test_forget_wildcard ... [OK]
    test_get_case ... [FAIL]
    test_modify_nothing ... [OK]
    test_multiple_copula ... [FAIL]
    test_name_punctuation ... [FAIL]
    test_same_as_nothing ... [OK]
    test_search_case ... [FAIL]
    test_search_unescape ... [FAIL]
    test_string_replace ... [FAIL]
    test_string_transliterate ... [FAIL]
    test_unicode_name ... [FAIL]
    test_wildcard_tamecard ... [FAIL]
ibid.test.plugins.test_google
  GDefineTest
    test_basic ... [OK]
    test_unicode_latin ... [OK]
ibid.test.plugins.test_url
  TestURLGrabber
    test_bad_grabs ... [OK]
    test_good_grabs ... ...

Revision history for this message
Ibid Branch Auto-Lander (ibid-tarmac) wrote :
Download full text (23.5 KiB)

The attempt to merge lp:~keegan-csmith/ibid/jinja2-517784 into lp:ibid failed. Below is the output from the failed tests.

ibid.test.plugins.test_calc
  CalcTest
    test_basic ... [OK]
    test_too_big ... [OK]
ibid.test.plugins.test_conversions
  UnihanTest
    test_simp_trad ... [OK]
/usr/lib/pymodules/python2.6/html5lib/treebuilders/soup.py:3: DeprecationWarning: BeautifulSoup 3.x (as of 3.1) is not fully compatible with html5lib and support will be removed in the future
/usr/lib/pymodules/python2.6/html5lib/treebuilders/soup.py:141: DataLossWarning: BeautifulSoup cannot represent elements in any namespace
/usr/lib/pymodules/python2.6/html5lib/treebuilders/soup.py:163: DataLossWarning: BeautifulSoup cannot represent elements in any namespace
ibid.test.plugins.test_core
  TestAddressed
    test_happy_prefix_names ... [OK]
    test_happy_suffix_names ... [OK]
    test_non_messages ... [OK]
    test_sad_prefix_names ... [OK]
    test_sad_suffix_names ... [OK]
    test_strip_punct ... [OK]
ibid.test.plugins.test_factoid
  FactoidTest
    test_also ... [FAIL]
    test_append ... [FAIL]
    test_duplicate_names ... [FAIL]
    test_empty ... [FAIL]
    test_forget_multiple ... [FAIL]
    test_forget_wildcard ... [OK]
    test_get_case ... [FAIL]
    test_modify_nothing ... [OK]
    test_multiple_copula ... [FAIL]
    test_name_punctuation ... [FAIL]
    test_same_as_nothing ... [OK]
    test_search_case ... [FAIL]
    test_search_unescape ... [FAIL]
    test_string_replace ... [FAIL]
    test_string_transliterate ... [FAIL]
    test_unicode_name ... [FAIL]
    test_wildcard_tamecard ... [FAIL]
ibid.test.plugins.test_google
  GDefineTest
    test_basic ... [OK]
    test_unicode_latin ... [OK]
ibid.test.plugins.test_url
  TestURLGrabber
    test_bad_grabs ... [OK]
    test_good_grabs ... ...

Revision history for this message
Jonathan Hitchcock (vhata) :
review: Approve
Revision history for this message
Stefano Rivera (stefanor) wrote :

This breaks because trial chdirs

apparently I thought the following would work:

templates = Environment(loader=FileSystemLoader(os.path.abspath(locate_resource('ibid', 'templates'))))

and said so on IRC

review: Needs Fixing
Revision history for this message
Keegan Carruthers-Smith (keegan-csmith) wrote :

Unit tests now pass \o/

lp:~keegan-csmith/ibid/jinja2-517784 updated
1033. By Keegan Carruthers-Smith

It's never too late to fix a bug.

Revision history for this message
Stefano Rivera (stefanor) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'INSTALL'
--- INSTALL 2011-01-24 21:31:11 +0000
+++ INSTALL 2011-10-25 12:01:24 +0000
@@ -25,7 +25,7 @@
25# aptitude install python-beautifulsoup \25# aptitude install python-beautifulsoup \
26 python-dateutil python-dnspython python-feedparser \26 python-dateutil python-dnspython python-feedparser \
27 python-html2text python-html5lib python-imdbpy \27 python-html2text python-html5lib python-imdbpy \
28 python-jinja python-silc python-setuptools \28 python-jinja2 python-silc python-setuptools \
29 python-simplejson python-soappy python-sqlalchemy \29 python-simplejson python-soappy python-sqlalchemy \
30 python-twisted python-wokkel30 python-twisted python-wokkel
3131
3232
=== modified file 'docs/install.rst'
--- docs/install.rst 2011-01-24 21:31:11 +0000
+++ docs/install.rst 2011-10-25 12:01:24 +0000
@@ -65,7 +65,7 @@
6565
66Web source and web services:66Web source and web services:
6767
68* `Jinja <http://jinja.pocoo.org/>`_68* `Jinja2 <http://jinja.pocoo.org/2/>`_
6969
70Other sources:70Other sources:
7171
@@ -264,7 +264,7 @@
264 user@box $ sudo aptitude install bzr python-configobj python-sqlalchemy \264 user@box $ sudo aptitude install bzr python-configobj python-sqlalchemy \
265 python-twisted python-beautifulsoup python-celementtree \265 python-twisted python-beautifulsoup python-celementtree \
266 python-html5lib python-setuptools python-simplejson \266 python-html5lib python-setuptools python-simplejson \
267 python-soappy python-jinja python-dateutil python-virtualenv267 python-soappy python-jinja2 python-dateutil python-virtualenv
268268
269Create a user to run your bot as::269Create a user to run your bot as::
270270
271271
=== modified file 'ibid/source/http.py'
--- ibid/source/http.py 2010-02-06 09:56:27 +0000
+++ ibid/source/http.py 2011-10-25 12:01:24 +0000
@@ -2,11 +2,12 @@
2# Released under terms of the MIT/X/Expat Licence. See COPYING for details.2# Released under terms of the MIT/X/Expat Licence. See COPYING for details.
33
4import logging4import logging
5import os
56
6from twisted.web import server, resource, static, xmlrpc, soap7from twisted.web import server, resource, static, xmlrpc, soap
7from twisted.application import internet8from twisted.application import internet
8from twisted.internet import reactor9from twisted.internet import reactor
9from jinja import Environment, FileSystemLoader10from jinja2 import Environment, FileSystemLoader
1011
11import ibid12import ibid
12from ibid.source import IbidSourceFactory13from ibid.source import IbidSourceFactory
@@ -15,7 +16,7 @@
15from ibid.utils import locate_resource16from ibid.utils import locate_resource
1617
17templates = Environment(loader=FileSystemLoader(18templates = Environment(loader=FileSystemLoader(
18 locate_resource('ibid', 'templates')))19 os.path.abspath(locate_resource('ibid', 'templates'))))
1920
20class Index(resource.Resource):21class Index(resource.Resource):
2122
2223
=== modified file 'setup.py'
--- setup.py 2011-03-15 10:00:04 +0000
+++ setup.py 2011-10-25 12:01:24 +0000
@@ -13,7 +13,7 @@
13 'feedparser',13 'feedparser',
14 'html2text',14 'html2text',
15 'html5lib',15 'html5lib',
16 'jinja',16 'jinja2',
17 'pyopenssl',17 'pyopenssl',
18 'PyStemmer',18 'PyStemmer',
19 'python-dateutil',19 'python-dateutil',

Subscribers

People subscribed via source and target branches