Merge pull request #9502 from edx/ned/import-path-differently

Change imports from path to use the stablest name.

cms/djangoapps/contentstore/management/commands/export_convert_format.py

@@ -5,7 +5,7 @@ to the archive format used by a different version of export.
 Sample invocation: ./manage.py export_convert_format mycourse.tar.gz ~/newformat/
 """
 import os
-from path import path
+from path import Path as path
 from django.core.management.base import BaseCommand, CommandError
 from django.conf import settings
 

cms/djangoapps/contentstore/management/commands/tests/test_export_convert_format.py

@@ -6,7 +6,7 @@ from django.core.management import call_command, CommandError
 from django.conf import settings
 from tempfile import mkdtemp
 import shutil
-from path import path
+from path import Path as path
 from contentstore.management.commands.export_convert_format import Command, extract_source
 from xmodule.tests.helpers import directories_equal
 

cms/djangoapps/contentstore/management/commands/tests/test_import.py

@@ -3,7 +3,7 @@ Unittests for importing a course via management command
 """
 
 import os
-from path import path
+from path import Path as path
 import shutil
 import tempfile
 

cms/djangoapps/contentstore/tests/test_contentstore.py

@@ -11,7 +11,7 @@ import ddt
 from datetime import timedelta
 from fs.osfs import OSFS
 from json import loads
-from path import path
+from path import Path as path
 from textwrap import dedent
 from uuid import uuid4
 from functools import wraps

cms/djangoapps/contentstore/views/import_export.py

@@ -8,7 +8,7 @@ import os
 import re
 import shutil
 import tarfile
-from path import path
+from path import Path as path
 from tempfile import mkdtemp
 
 from django.conf import settings

cms/djangoapps/contentstore/views/tests/test_import_export.py

@@ -9,7 +9,7 @@ import os
 import shutil
 import tarfile
 import tempfile
-from path import path
+from path import Path as path
 from uuid import uuid4
 
 from django.test.utils import override_settings

cms/envs/aws.py

@@ -18,7 +18,7 @@ from .common import *
 from openedx.core.lib.logsettings import get_logger_config
 import os
 
-from path import path
+from path import Path as path
 from xmodule.modulestore.modulestore_settings import convert_module_store_setting_if_needed
 
 # SERVICE_VARIANT specifies name of the variant used, which decides what JSON

cms/envs/bok_choy.py

@@ -11,7 +11,7 @@ from the same directory.
 """
 
 import os
-from path import path
+from path import Path as path
 
 # Pylint gets confused by path.py instances, which report themselves as class
 # objects. As a result, pylint applies the wrong regex in validating names,

cms/envs/common.py

@@ -46,7 +46,7 @@ from lms.envs.common import (
     # display credit eligibility table on the CMS or not.
     ENABLE_CREDIT_ELIGIBILITY, YOUTUBE_API_KEY
 )
-from path import path
+from path import Path as path
 from warnings import simplefilter
 
 from lms.djangoapps.lms_xblock.mixin import LmsBlockMixin

cms/envs/test.py

@@ -20,7 +20,7 @@ sessions. Assumes structure:
 
 from .common import *
 import os
-from path import path
+from path import Path as path
 from warnings import filterwarnings, simplefilter
 from uuid import uuid4
 

cms/envs/yaml_config.py

@@ -21,7 +21,7 @@ from openedx.core.lib.logsettings import get_logger_config
 from util.config_parse import convert_tokens
 import os
 
-from path import path
+from path import Path as path
 from xmodule.modulestore.modulestore_settings import convert_module_store_setting_if_needed
 
 # https://stackoverflow.com/questions/2890146/how-to-force-pyyaml-to-load-strings-as-unicode-objects