From 6c5780c8071d3b2620655ff083c1c7f80cab40fb Mon Sep 17 00:00:00 2001
From: Feanil Patel <feanil@edx.org>
Date: Thu, 5 Sep 2019 12:41:22 -0400
Subject: [PATCH] The version of python2 we're running doesn't have the
 backported alias.

---
 pavelib/paver_tests/test_paver_bok_choy_cmds.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pavelib/paver_tests/test_paver_bok_choy_cmds.py b/pavelib/paver_tests/test_paver_bok_choy_cmds.py
index ed7b9db214..855f636e4d 100644
--- a/pavelib/paver_tests/test_paver_bok_choy_cmds.py
+++ b/pavelib/paver_tests/test_paver_bok_choy_cmds.py
@@ -6,7 +6,12 @@ from __future__ import absolute_import
 
 import os
 import unittest
-from test.support import EnvironmentVarGuard
+import six
+
+if six.PY2:
+    from test.test_support import EnvironmentVarGuard
+else:
+    from test.support import EnvironmentVarGuard   # pylint: disable=import-error,no-name-in-module
 
 from pavelib.utils.test.suites import BokChoyTestSuite