From 0069d7db339fcfcb0d84681d1cded5b3ea5918a8 Mon Sep 17 00:00:00 2001 From: Ayub khan Date: Thu, 11 Jul 2019 16:06:48 +0500 Subject: [PATCH] INCR-419 python3 compatibility --- common/lib/conftest.py | 7 +++++-- common/lib/xmodule/setup.py | 2 ++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/common/lib/conftest.py b/common/lib/conftest.py index 180348f6f1..4758af5667 100644 --- a/common/lib/conftest.py +++ b/common/lib/conftest.py @@ -1,11 +1,14 @@ """Code run by pylint before running any tests.""" # Patch the xml libs before anything else. -from safe_lxml import defuse_xml_libs -defuse_xml_libs() +from __future__ import absolute_import import pytest +from safe_lxml import defuse_xml_libs + +defuse_xml_libs() + @pytest.fixture(autouse=True) def no_webpack_loader(monkeypatch): diff --git a/common/lib/xmodule/setup.py b/common/lib/xmodule/setup.py index 6f9dd6edb9..a45bf043e4 100644 --- a/common/lib/xmodule/setup.py +++ b/common/lib/xmodule/setup.py @@ -1,3 +1,5 @@ +from __future__ import absolute_import + from setuptools import find_packages, setup XMODULES = [