[#3126] remove assert_(not)_in from helpers

- `assert_in` and `assert_not_in` were duplicated
  in `ckan/tests/legacy/__init__.py` and
  `ckan.tests.helpers` because they were not
  available in python2.6
- This commit removes the back porting from those
  files and just imports from nose.tools directly
  everywhere

ckan/tests/controllers/test_api.py

@@ -7,10 +7,9 @@
 import json
 
 from routes import url_for
-from nose.tools import assert_equal
+from nose.tools import assert_equal, assert_in
 
 import ckan.tests.helpers as helpers
-from ckan.tests.helpers import assert_in
 from ckan.tests import factories
 from ckan import model
 

ckan/tests/controllers/test_group.py

@@ -1,15 +1,14 @@
 # encoding: utf-8
 
 from bs4 import BeautifulSoup
-from nose.tools import assert_equal, assert_true
+from nose.tools import assert_equal, assert_true, assert_in
 
 from routes import url_for
 
 import ckan.tests.helpers as helpers
 import ckan.model as model
 from ckan.tests import factories
 
-assert_in = helpers.assert_in
 webtest_submit = helpers.webtest_submit
 submit_and_follow = helpers.submit_and_follow
 

ckan/tests/controllers/test_organization.py

@@ -1,12 +1,12 @@
 # encoding: utf-8
 
 from bs4 import BeautifulSoup
-from nose.tools import assert_equal, assert_true
+from nose.tools import assert_equal, assert_true, assert_in
 from routes import url_for
 from mock import patch
 
 from ckan.tests import factories, helpers
-from ckan.tests.helpers import webtest_submit, submit_and_follow, assert_in
+from ckan.tests.helpers import webtest_submit, submit_and_follow
 
 
 class TestOrganizationNew(helpers.FunctionalTestBase):

ckan/tests/controllers/test_package.py

@@ -6,6 +6,7 @@
     assert_not_equal,
     assert_raises,
     assert_true,
+    assert_in
 )
 
 from mock import patch, MagicMock
@@ -17,10 +18,8 @@
 
 import ckan.tests.helpers as helpers
 import ckan.tests.factories as factories
-from ckan.tests.helpers import assert_in
 
 
-assert_in = helpers.assert_in
 webtest_submit = helpers.webtest_submit
 submit_and_follow = helpers.submit_and_follow
 

ckan/tests/controllers/test_tags.py

@@ -3,15 +3,14 @@
 import math
 import string
 
-from nose.tools import assert_equal, assert_true, assert_false
+from nose.tools import assert_equal, assert_true, assert_false, assert_in
 from bs4 import BeautifulSoup
 
 from routes import url_for
 
 import ckan.tests.helpers as helpers
 from ckan.tests import factories
 
-assert_in = helpers.assert_in
 webtest_submit = helpers.webtest_submit
 submit_and_follow = helpers.submit_and_follow
 

ckan/tests/helpers.py

@@ -22,6 +22,7 @@
 import webtest
 from pylons import config
 import nose.tools
+from nose.tools import assert_in, assert_not_in
 import mock
 
 import ckan.lib.search as search
@@ -30,17 +31,6 @@
 import ckan.logic as logic
 
 
-try:
-    from nose.tools import assert_in, assert_not_in
-except ImportError:
-    # Python 2.6 doesn't have these, so define them here
-    def assert_in(a, b, msg=None):
-        assert a in b, msg or '%r was not in %r' % (a, b)
-
-    def assert_not_in(a, b, msg=None):
-        assert a not in b, msg or '%r was in %r' % (a, b)
-
-
 def reset_db():
     '''Reset CKAN's database.
 

ckan/tests/legacy/__init__.py

@@ -355,15 +355,6 @@ def skip_test(*args):
 def clear_flash(res=None):
     messages = h._flash.pop_messages()
 
-try:
-    from nose.tools import assert_in, assert_not_in
-except ImportError:
-    def assert_in(a, b, msg=None):
-        assert a in b, msg or '%r was not in %r' % (a, b)
-    def assert_not_in(a, b, msg=None):
-        assert a not in b, msg or '%r was in %r' % (a, b)
-
-
 class StatusCodes:
     STATUS_200_OK = 200
     STATUS_201_CREATED = 201

ckan/tests/legacy/functional/api/test_api.py

@@ -2,10 +2,10 @@
 
 import json
 
+from nose.tools import assert_in
+
 from ckan.tests.legacy.functional.api.base import *
 
-import ckan.tests.legacy
-assert_in = ckan.tests.legacy.assert_in
 
 class ApiTestCase(ApiTestCase, ControllerTestCase):
 

ckan/tests/legacy/lib/test_dictization.py

@@ -1,10 +1,10 @@
 # encoding: utf-8
 
-from ckan.tests.legacy import assert_equal, assert_not_in, assert_in
+from nose.tools import assert_equal, assert_not_in, assert_in
 from pprint import pprint, pformat
 from difflib import unified_diff
-import ckan.lib.search as search
 
+import ckan.lib.search as search
 from ckan.lib.create_test_data import CreateTestData
 from ckan import model
 from ckan.lib.dictization import (table_dictize,

ckan/tests/legacy/models/test_group.py

@@ -1,9 +1,12 @@
 # encoding: utf-8
 
-from ckan.tests.legacy import assert_equal, assert_in, assert_not_in, CreateTestData
+from nose.tools import assert_in, assert_not_in, assert_equal
+
+from ckan.tests.legacy import CreateTestData
 
 import ckan.model as model
 
+
 class TestGroup(object):
 
     @classmethod

ckan/tests/lib/search/test_index.py

@@ -3,17 +3,13 @@
 import datetime
 import hashlib
 import json
-import nose.tools
 import nose
+from nose.tools import assert_equal, assert_in, assert_not_in
 
 from pylons import config
 import ckan.lib.search as search
 import ckan.tests.helpers as helpers
 
-assert_equal = nose.tools.assert_equal
-assert_in = helpers.assert_in
-assert_not_in = helpers.assert_not_in
-
 
 class TestSearchIndex(object):
 

ckan/tests/lib/test_mailer.py

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-from nose.tools import assert_equal, assert_raises
+from nose.tools import assert_equal, assert_raises, assert_in
 from pylons import config
 from email.mime.text import MIMEText
 from email.parser import Parser
@@ -16,8 +16,6 @@
 import ckan.tests.helpers as helpers
 import ckan.tests.factories as factories
 
-assert_in = helpers.assert_in
-
 
 class MailerBase(SmtpServerHarness):
 

ckanext/example_igroupform/tests/test_controllers.py

@@ -1,14 +1,13 @@
 # encoding: utf-8
 
-from nose.tools import assert_equal
+from nose.tools import assert_equal, assert_in
 from routes import url_for
 
 import ckan.plugins as plugins
 import ckan.tests.helpers as helpers
 import ckan.model as model
 from ckan.tests import factories
 
-assert_in = helpers.assert_in
 webtest_submit = helpers.webtest_submit
 submit_and_follow = helpers.submit_and_follow
 

ckanext/example_iuploader/test/test_plugin.py

@@ -6,6 +6,7 @@
 from mock import patch
 from nose.tools import (
     assert_equal,
+    assert_in,
     assert_is_instance
 )
 from pyfakefs import fake_filesystem
@@ -19,7 +20,6 @@
 import ckan.tests.helpers as helpers
 import ckanext.example_iuploader.plugin as plugin
 
-assert_in = helpers.assert_in
 webtest_submit = helpers.webtest_submit
 submit_and_follow = helpers.submit_and_follow
 

ckanext/example_theme/custom_emails/tests.py

@@ -11,10 +11,7 @@
 from ckan.tests.lib.test_mailer import MailerBase
 import ckan.tests.helpers as helpers
 
-from nose.tools import assert_equal
-
-
-assert_in = helpers.assert_in
+from nose.tools import assert_equal, assert_in
 
 
 class TestExampleCustomEmailsPlugin(MailerBase):