From 6c82500627b5c2e0602312faefba97fbe15044b9 Mon Sep 17 00:00:00 2001 From: Christian Heimes Date: Mon, 29 Feb 2016 09:19:18 +0100 Subject: Fedora 24 fixes for Python 3.5 and pylint 1.5 Fedora 24 has Python 3.5 instead of Python 3.4. tox.ini now uses python3 to use any Python 3 interpreter. Python 3.5 has unittest.mock in the stdlib. Tests must attempt to import mock from unittest first. Pylint 1.5 has deprecated a couple of old options. Dogtag doesn't use the options anyway. I just removed them from dogtag.pylintrc. --- tests/python/test_authority.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'tests/python') diff --git a/tests/python/test_authority.py b/tests/python/test_authority.py index b25816c23..e55b9c82d 100644 --- a/tests/python/test_authority.py +++ b/tests/python/test_authority.py @@ -19,7 +19,10 @@ # All rights reserved. # -import mock +try: + from unittest import mock +except ImportError: + import mock import unittest import uuid -- cgit