From a6c7190fa7756b04a1c6a9b1dcd19a4a7682f526 Mon Sep 17 00:00:00 2001 From: Dominik Moritz Date: Thu, 1 Nov 2012 21:23:32 +0100 Subject: [PATCH] pep8 in test_helpers.py --- ckan/tests/lib/test_helpers.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/ckan/tests/lib/test_helpers.py b/ckan/tests/lib/test_helpers.py index 68859977c62..be929117fd6 100644 --- a/ckan/tests/lib/test_helpers.py +++ b/ckan/tests/lib/test_helpers.py @@ -16,6 +16,7 @@ WITH_UNICODE = u'''[From the project website] This project collects information on China’s foreign aid from the China Commerce Yearbook (中国商务年鉴) and the Almanac of China’s Foreign Economic Relations & Trade (中国对外经济贸易年间), published annually by China’s Ministry of Commerce (MOFCOM). Data is reported for each year between 1990 and 2005, with the exception of 2002, in which year China’s Ministry of Commerce published no project-level data on its foreign aid giving.''' + class TestHelpers(TestController): def test_extract_markdown(self): @@ -79,20 +80,20 @@ def test_time_ago_in_words_from_str(self): def test_gravatar(self): email = 'zephod@gmail.com' - expected =[''] # Hash the email address import hashlib email_hash = hashlib.md5(email).hexdigest() res = h.linked_gravatar(email_hash, 200, default='mm') for e in expected: - assert e in res, (e,res) + assert e in res, (e, res) def test_gravatar_config_set_default(self): """Test when default gravatar is None, it is pulled from the config file""" email = 'zephod@gmail.com' default = config.get('ckan.gravatar_default', 'identicon') - expected =[''] # Hash the email address @@ -100,13 +101,13 @@ def test_gravatar_config_set_default(self): email_hash = hashlib.md5(email).hexdigest() res = h.linked_gravatar(email_hash, 200) for e in expected: - assert e in res, (e,res) + assert e in res, (e, res) def test_gravatar_encodes_url_correctly(self): """Test when the default gravatar is a url, it gets urlencoded""" email = 'zephod@gmail.com' default = 'http://example.com/images/avatar.jpg' - expected =[''] # Hash the email address @@ -114,7 +115,7 @@ def test_gravatar_encodes_url_correctly(self): email_hash = hashlib.md5(email).hexdigest() res = h.linked_gravatar(email_hash, 200, default=default) for e in expected: - assert e in res, (e,res) + assert e in res, (e, res) def test_parse_rfc_2822_no_timezone_specified(self): """ @@ -161,7 +162,6 @@ def test_escape_js(self): assert_equal(output_str, expected_str) - def test_get_pkg_dict_extra(self): from ckan.lib.create_test_data import CreateTestData @@ -170,10 +170,10 @@ def test_get_pkg_dict_extra(self): CreateTestData.create() - pkg_dict = get_action('package_show')({'model':model,'user':u'tester'},{'id': 'annakarenina'}) + pkg_dict = get_action('package_show')({'model': model, 'user': u'tester'}, {'id': 'annakarenina'}) assert_equal(h.get_pkg_dict_extra(pkg_dict, 'genre'), '"romantic novel"') assert_equal(h.get_pkg_dict_extra(pkg_dict, 'extra_not_found'), None) - assert_equal(h.get_pkg_dict_extra(pkg_dict, 'extra_not_found','default_value'), 'default_value') + assert_equal(h.get_pkg_dict_extra(pkg_dict, 'extra_not_found', 'default_value'), 'default_value')