cubicweb: comparison cubicweb/devtools/testlib.py

equal deleted inserted replaced

-:6b3523f81f42
+:26744ad37953
 #
 # You should have received a copy of the GNU Lesser General Public License along
 # with CubicWeb.  If not, see <http://www.gnu.org/licenses/>.
 """Base classes and utilities for cubicweb tests"""
-from __future__ import print_function
 import sys
 import re
-import warnings
 from os.path import dirname, join, abspath
 from math import log
 from contextlib import contextmanager
 from inspect import isgeneratorfunction
 from itertools import chain
+from unittest import TestCase
-from six import binary_type, text_type, string_types, reraise
+from urllib.parse import urlparse, parse_qs, unquote as urlunquote
-from six.moves import range
-from six.moves.urllib.parse import urlparse, parse_qs, unquote as urlunquote
 import yams.schema
 from logilab.common.testlib import Tags, nocoverage
 from logilab.common.debugger import Debugger
 from cubicweb.server.hook import SendMailOp
 from cubicweb.devtools import SYSTEM_ENTITIES, SYSTEM_RELATIONS, VIEW_VALIDATORS
 from cubicweb.devtools import fake, htmlparser, DEFAULT_EMPTY_DB_ID
 from cubicweb.devtools.fill import insert_entity_queries, make_relations_queries
 from cubicweb.web.views.authentication import Session
-if sys.version_info[:2] < (3, 4):
-from unittest2 import TestCase
-if not hasattr(TestCase, 'subTest'):
-raise ImportError('no subTest support in available unittest2')
-try:
-from backports.tempfile import TemporaryDirectory  # noqa
-except ImportError:
-# backports.tempfile not available
-TemporaryDirectory = None
-else:
-from unittest import TestCase
-from tempfile import TemporaryDirectory  # noqa
-# in python 2.7, DeprecationWarning are not shown anymore by default
-warnings.filterwarnings('default', category=DeprecationWarning)
 # provide a data directory for the test class ##################################
 class BaseTestCase(TestCase):
 def new_access(self, login):
 """provide a new RepoAccess object for a given user
 The access is automatically closed at the end of the test."""
-login = text_type(login)
 access = RepoAccess(self.repo, login, self.requestcls)
 self._open_access.add(access)
 return access
 def _close_access(self):
 db_handler = devtools.get_test_db_handler(self.config, self.init_config)
 db_handler.build_db_cache(self.test_db_id, self.pre_setup_database)
 db_handler.restore_database(self.test_db_id)
 self.repo = db_handler.get_repo(startup=True)
 # get an admin session (without actual login)
-login = text_type(db_handler.config.default_admin_config['login'])
+login = db_handler.config.default_admin_config['login']
 self.admin_access = self.new_access(login)
 # config management ########################################################
 @classmethod  # XXX could be turned into a regular method
 This method will be called by the database handler once the config has
 been properly bootstrapped.
 """
 admincfg = config.default_admin_config
-cls.admlogin = text_type(admincfg['login'])
+cls.admlogin = admincfg['login']
 cls.admpassword = admincfg['password']
 # uncomment the line below if you want rql queries to be logged
 # config.global_set_option('query-log-file',
 #                          '/tmp/test_rql_log.' + `os.getpid()`)
 config.global_set_option('log-file', None)
 def create_user(self, req, login=None, groups=('users',), password=None,
 email=None, commit=True, **kwargs):
 """create and return a new user entity"""
 if password is None:
 password = login
-if login is not None:
-login = text_type(login)
 user = req.create_entity('CWUser', login=login,
 upassword=password, **kwargs)
 req.execute('SET X in_group G WHERE X eid %%(x)s, G name IN(%s)'
 % ','.join(repr(str(g)) for g in groups),
 {'x': user.eid})
 if email is not None:
-req.create_entity('EmailAddress', address=text_type(email),
+req.create_entity('EmailAddress', address=email,
 reverse_primary_email=user)
 user.cw_clear_relation_cache('in_group', 'subject')
 if commit:
 try:
 req.commit()  # req is a session
 (entity type / relation definition). Resulting permissions will be
 similar to `orig_permissions.update(partial_perms)`.
 """
 torestore = []
 for erschema, etypeperms in chain(perm_overrides, perm_kwoverrides.items()):
-if isinstance(erschema, string_types):
+if isinstance(erschema, str):
 erschema = self.schema[erschema]
 for action, actionperms in etypeperms.items():
 origperms = erschema.permissions[action]
 erschema.set_action_permissions(action, actionperms)
 torestore.append([erschema, action, origperms])
 """parses `url` and builds the corresponding CW-web request
 req.form will be setup using the url's query string
 """
 with self.admin_access.web_request(url=url) as req:
-if isinstance(url, text_type):
+if isinstance(url, str):
 url = url.encode(req.encoding)  # req.setup_params() expects encoded strings
 querystring = urlparse(url)[-2]
 params = parse_qs(querystring)
 req.setup_params(params)
 yield req
 klass, exc, tcbk = sys.exc_info()
 try:
 msg = '[%s in %s] %s' % (klass, view.__regid__, exc)
 except Exception:
 msg = '[%s in %s] undisplayable exception' % (klass, view.__regid__)
-reraise(AssertionError, AssertionError(msg), sys.exc_info()[-1])
+raise AssertionError(msg).with_traceback(sys.exc_info()[-1])
 return self._check_html(output, view, template)
 def get_validator(self, view=None, content_type=None, output=None):
 if view is not None:
 try:
 @nocoverage
 def _check_html(self, output, view, template='main-template'):
 """raises an exception if the HTML is invalid"""
 output = output.strip()
-if isinstance(output, text_type):
+if isinstance(output, str):
 # XXX
 output = output.encode('utf-8')
 validator = self.get_validator(view, output=output)
 if validator is None:
 return output  # return raw output if no validator is defined
 msg += str_exc.encode(sys.getdefaultencoding(), 'replace')
 if content is not None:
 position = getattr(exc, "position", (0,))[0]
 if position:
 # define filter
-if isinstance(content, binary_type):
+if isinstance(content, bytes):
-content = text_type(content, sys.getdefaultencoding(), 'replace')
+content = str(content, sys.getdefaultencoding(), 'replace')
 content = validator.preprocess_data(content)
 content = content.splitlines()
 width = int(log(len(content), 10)) + 1
 line_template = " %" + ("%i" % width) + "i: %s"
 # XXX no need to iterate the whole file except to get

changeset 12567	26744ad37953
parent 12505	55014a79b2a5
child 12591	f5f83d72ba8d