Make relative imports explicitly relative

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

@@ -7,7 +7,7 @@ from xmodule.modulestore.django import modulestore
 from xmodule.contentstore.django import contentstore
 from xmodule.modulestore import Location
 from xmodule.course_module import CourseDescriptor
-from prompt import query_yes_no
+from .prompt import query_yes_no
 
 from auth.authz import _delete_course_group
 

cms/djangoapps/contentstore/tests/test_contentstore.py

@@ -15,7 +15,7 @@ from json import loads
 from django.contrib.auth.models import User
 from contentstore.utils import get_modulestore
 
-from utils import ModuleStoreTestCase, parse_json
+from .utils import ModuleStoreTestCase, parse_json
 from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory
 
 from xmodule.modulestore import Location

cms/djangoapps/contentstore/tests/test_course_settings.py

@@ -16,7 +16,7 @@ from models.settings.course_grading import CourseGradingModel
 from contentstore.utils import get_modulestore
 
 from django.test import TestCase
-from utils import ModuleStoreTestCase
+from .utils import ModuleStoreTestCase
 from xmodule.modulestore.tests.factories import CourseFactory
 
 from models.settings.course_metadata import CourseMetadata

cms/djangoapps/contentstore/tests/tests.py

@@ -24,7 +24,7 @@ from xmodule.course_module import CourseDescriptor
 from xmodule.seq_module import SequenceDescriptor
 
 from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory
-from utils import ModuleStoreTestCase, parse_json, user, registration
+from .utils import ModuleStoreTestCase, parse_json, user, registration
 
 
 class ContentStoreTestCase(ModuleStoreTestCase):

common/djangoapps/status/tests.py

@@ -4,7 +4,7 @@ import os
 from django.test.utils import override_settings
 from tempfile import NamedTemporaryFile
 
-from status import get_site_status_msg
+from .status import get_site_status_msg
 
 # Get a name where we can put test files
 TMP_FILE = NamedTemporaryFile(delete=False)

common/djangoapps/terrain/steps.py

 from lettuce import world, step
-from factories import *
+from .factories import *
 from lettuce.django import django_url
 from django.contrib.auth.models import User
 from student.models import CourseEnrollment

common/lib/capa/capa/capa_problem.py

@@ -39,11 +39,11 @@ import verifiers
 import verifiers.draganddrop
 
 import calc
-from correctmap import CorrectMap
+from .correctmap import CorrectMap
 import eia
 import inputtypes
 import customrender
-from util import contextualize_text, convert_files_to_filenames
+from .util import contextualize_text, convert_files_to_filenames
 import xqueue_interface
 
 # to be replaced with auto-registering

common/lib/capa/capa/checker.py

@@ -12,8 +12,8 @@ from path import path
 from cStringIO import StringIO
 from collections import defaultdict
 
-from calc import UndefinedVariable
-from capa_problem import LoncapaProblem
+from .calc import UndefinedVariable
+from .capa_problem import LoncapaProblem
 from mako.lookup import TemplateLookup
 
 logging.basicConfig(format="%(levelname)s %(message)s")

common/lib/capa/capa/chem/tests.py

@@ -2,7 +2,7 @@ import codecs
 from fractions import Fraction
 import unittest
 
-from chemcalc import (compare_chemical_expression, divide_chemical_expression,
+from .chemcalc import (compare_chemical_expression, divide_chemical_expression,
                       render_to_html, chemical_equations_equal)
 
 import miller

common/lib/capa/capa/customrender.py

@@ -6,7 +6,7 @@ These tags do not have state, so they just get passed the system (for access to
 and the xml element.
 """
 
-from registry import TagRegistry
+from .registry import TagRegistry
 
 import logging
 import re
@@ -15,7 +15,7 @@ import json
 
 from lxml import etree
 import xml.sax.saxutils as saxutils
-from registry import TagRegistry
+from .registry import TagRegistry
 
 log = logging.getLogger(__name__)
 

common/lib/capa/capa/inputtypes.py

@@ -47,7 +47,7 @@ import sys
 import os
 import pyparsing
 
-from registry import TagRegistry
+from .registry import TagRegistry
 from capa.chem import chemcalc
 
 log = logging.getLogger(__name__)

common/lib/capa/capa/responsetypes.py

@@ -28,10 +28,10 @@ from collections import namedtuple
 from shapely.geometry import Point, MultiPoint
 
 # specific library imports
-from calc import evaluator, UndefinedVariable
-from correctmap import CorrectMap
+from .calc import evaluator, UndefinedVariable
+from .correctmap import CorrectMap
 from datetime import datetime
-from util import *
+from .util import *
 from lxml import etree
 from lxml.html.soupparser import fromstring as fromstring_bs     # uses Beautiful Soup!!! FIXME?
 import xqueue_interface

common/lib/capa/capa/tests/test_html_render.py

@@ -7,7 +7,7 @@ import json
 import mock
 
 from capa.capa_problem import LoncapaProblem
-from response_xml_factory import StringResponseXMLFactory, CustomResponseXMLFactory
+from .response_xml_factory import StringResponseXMLFactory, CustomResponseXMLFactory
 from . import test_system
 
 class CapaHtmlRenderTest(unittest.TestCase):

common/lib/capa/capa/util.py

-from calc import evaluator, UndefinedVariable
+from .calc import evaluator, UndefinedVariable
 
 #-----------------------------------------------------------------------------
 #

common/lib/capa/capa/verifiers/tests_draganddrop.py

 import unittest
 
 import draganddrop
-from draganddrop import PositionsCompare
+from .draganddrop import PositionsCompare
 import json
 
 

common/lib/xmodule/xmodule/backcompat_module.py

 """
 These modules exist to translate old format XML into newer, semantic forms
 """
-from x_module import XModuleDescriptor
+from .x_module import XModuleDescriptor
 from lxml import etree
 from functools import wraps
 import logging

common/lib/xmodule/xmodule/capa_module.py

@@ -14,7 +14,7 @@ from pkg_resources import resource_string
 from capa.capa_problem import LoncapaProblem
 from capa.responsetypes import StudentInputError
 from capa.util import convert_files_to_filenames
-from progress import Progress
+from .progress import Progress
 from xmodule.x_module import XModule
 from xmodule.raw_module import RawDescriptor
 from xmodule.exceptions import NotFoundError

common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py

@@ -10,7 +10,7 @@ from xmodule.stringify import stringify_children
 from xmodule.xml_module import XmlDescriptor
 import self_assessment_module
 import open_ended_module
-from combined_open_ended_rubric import CombinedOpenEndedRubric, GRADER_TYPE_IMAGE_DICT, HUMAN_GRADER_TYPE, LEGEND_LIST
+from .combined_open_ended_rubric import CombinedOpenEndedRubric, GRADER_TYPE_IMAGE_DICT, HUMAN_GRADER_TYPE, LEGEND_LIST
 
 log = logging.getLogger("mitx.courseware")
 

common/lib/xmodule/xmodule/open_ended_grading_classes/controller_query_service.py

 import logging
-from grading_service_module import GradingService
+from .grading_service_module import GradingService
 
 log = logging.getLogger(__name__)
 

common/lib/xmodule/xmodule/open_ended_grading_classes/grading_service_module.py

@@ -5,7 +5,7 @@ import requests
 from requests.exceptions import RequestException, ConnectionError, HTTPError
 import sys
 
-from combined_open_ended_rubric import CombinedOpenEndedRubric
+from .combined_open_ended_rubric import CombinedOpenEndedRubric
 from lxml import etree
 
 log = logging.getLogger(__name__)

common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py

@@ -22,7 +22,7 @@ from numpy import median
 
 from datetime import datetime
 
-from combined_open_ended_rubric import CombinedOpenEndedRubric
+from .combined_open_ended_rubric import CombinedOpenEndedRubric
 
 log = logging.getLogger("mitx.courseware")
 

common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py

@@ -12,7 +12,7 @@ from xmodule.stringify import stringify_children
 from xmodule.xml_module import XmlDescriptor
 from xmodule.modulestore import Location
 from capa.util import *
-from peer_grading_service import PeerGradingService, MockPeerGradingService
+from .peer_grading_service import PeerGradingService, MockPeerGradingService
 import controller_query_service
 
 from datetime import datetime

common/lib/xmodule/xmodule/open_ended_grading_classes/peer_grading_service.py

 import json
 import logging
 
-from grading_service_module import GradingService
+from .grading_service_module import GradingService
 
 log = logging.getLogger(__name__)
 

common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py

@@ -7,7 +7,7 @@ from xmodule.progress import Progress
 from xmodule.stringify import stringify_children
 import openendedchild
 
-from combined_open_ended_rubric import CombinedOpenEndedRubric
+from .combined_open_ended_rubric import CombinedOpenEndedRubric
 
 log = logging.getLogger("mitx.courseware")
 

common/lib/xmodule/xmodule/peer_grading_module.py

@@ -11,7 +11,7 @@ from .x_module import XModule
 from xmodule.raw_module import RawDescriptor
 from xmodule.modulestore import Location
 from xmodule.modulestore.django import modulestore
-from timeinfo import TimeInfo
+from .timeinfo import TimeInfo
 from xblock.core import Object, Integer, Boolean, String, Scope
 
 from xmodule.open_ended_grading_classes.peer_grading_service import PeerGradingService, GradingServiceError, MockPeerGradingService

common/lib/xmodule/xmodule/schematic_module.py

 import json
 
-from x_module import XModule, XModuleDescriptor
+from .x_module import XModule, XModuleDescriptor
 
 
 class ModuleDescriptor(XModuleDescriptor):

common/lib/xmodule/xmodule/tests/test_randomize_module.py

@@ -13,7 +13,7 @@ COURSE = 'test_course'
 START = '2013-01-01T01:00:00'
 
 
-from test_course_module import DummySystem as DummyImportSystem
+from .test_course_module import DummySystem as DummyImportSystem
 from . import test_system
 
 

common/lib/xmodule/xmodule/timeinfo.py

 import dateutil
 import dateutil.parser
 import datetime
-from timeparse import parse_timedelta
+from .timeparse import parse_timedelta
 
 import logging
 log = logging.getLogger(__name__)

lms/djangoapps/circuit/views.py

@@ -9,7 +9,7 @@ from django.http import HttpResponse
 from django.shortcuts import redirect
 from mitxmako.shortcuts import render_to_response, render_to_string
 
-from models import ServerCircuit
+from .models import ServerCircuit
 
 
 def circuit_line(circuit):

lms/djangoapps/courseware/courses.py

@@ -11,7 +11,7 @@ from django.conf import settings
 from django.core.urlresolvers import reverse
 from django.http import Http404
 
-from module_render import get_module
+from .module_render import get_module
 from xmodule.course_module import CourseDescriptor
 from xmodule.modulestore import Location
 from xmodule.modulestore.django import modulestore

lms/djangoapps/courseware/grades.py

@@ -10,12 +10,12 @@ from django.contrib.auth.models import User
 
 from .model_data import ModelDataCache, LmsKeyValueStore
 from xblock.core import Scope
-from module_render import get_module
+from .module_render import get_module
 from xmodule import graders
 from xmodule.capa_module import CapaModule
 from xmodule.course_module import CourseDescriptor
 from xmodule.graders import Score
-from models import StudentModule
+from .models import StudentModule
 
 log = logging.getLogger("mitx.courseware")
 

lms/djangoapps/courseware/module_render.py

@@ -18,7 +18,7 @@ from requests.auth import HTTPBasicAuth
 from capa.xqueue_interface import XQueueInterface
 from courseware.access import has_access
 from mitxmako.shortcuts import render_to_string
-from models import StudentModule
+from .models import StudentModule
 from psychometrics.psychoanalyze import make_psychometrics_data_update_handler
 from student.models import unique_id_for_user
 from xmodule.errortracker import exc_info_to_str

lms/djangoapps/courseware/tabs.py

@@ -21,7 +21,7 @@ from fs.errors import ResourceNotFoundError
 from courseware.access import has_access
 
 from lxml.html import rewrite_links
-from module_render import get_module
+from .module_render import get_module
 from courseware.access import has_access
 from xmodule.modulestore import Location
 from xmodule.modulestore.django import modulestore

lms/djangoapps/courseware/tests/test_access.py

@@ -12,7 +12,7 @@ from xmodule.modulestore import Location
 from xmodule.timeparse import parse_time
 from xmodule.x_module import XModule, XModuleDescriptor
 import courseware.access as access
-from factories import CourseEnrollmentAllowedFactory
+from .factories import CourseEnrollmentAllowedFactory
 
 
 class AccessTestCase(TestCase):

lms/djangoapps/courseware/tests/test_module_render.py

@@ -25,7 +25,7 @@ from courseware.tests.tests import PageLoader
 from student.models import Registration
 from courseware.model_data import ModelDataCache
 
-from factories import UserFactory
+from .factories import UserFactory
 
 
 class Stub:

lms/djangoapps/courseware/tests/test_views.py

@@ -19,7 +19,7 @@ from xmodule.modulestore.exceptions import InvalidLocationError,\
 import courseware.views as views
 from xmodule.modulestore import Location
 
-from factories import UserFactory
+from .factories import UserFactory
 
 
 class Stub():

lms/djangoapps/courseware/views.py

@@ -22,7 +22,7 @@ from courseware.courses import (get_courses, get_course_with_access,
                                 get_courses_by_university, sort_by_announcement)
 import courseware.tabs as tabs
 from courseware.model_data import ModelDataCache
-from module_render import toc_for_course, get_module_for_descriptor, get_module
+from .module_render import toc_for_course, get_module_for_descriptor, get_module
 from courseware.models import StudentModule, StudentModuleHistory
 
 from django_comment_client.utils import get_discussion_title

lms/djangoapps/django_comment_client/helpers.py

 from django.core.urlresolvers import reverse
 from django.conf import settings
 from mitxmako.shortcuts import render_to_string
-from mustache_helpers import mustache_helpers
+from .mustache_helpers import mustache_helpers
 from django.core.urlresolvers import reverse
 from functools import partial
 
-from utils import *
+from .utils import *
 import django_comment_client.settings as cc_settings
 
 import pystache_custom as pystache

lms/djangoapps/licenses/tests.py

@@ -6,7 +6,7 @@ from tempfile import NamedTemporaryFile
 from django.test import TestCase
 from django.core.management import call_command
 
-from models import CourseSoftware, UserLicense
+from .models import CourseSoftware, UserLicense
 
 COURSE_1 = 'edX/toy/2012_Fall'
 

lms/djangoapps/licenses/views.py

@@ -11,8 +11,8 @@ from django.contrib.auth.models import User
 from django.http import HttpResponse, Http404
 from django.views.decorators.csrf import requires_csrf_token, csrf_protect
 
-from models import CourseSoftware
-from models import get_courses_licenses, get_or_create_license, get_license
+from .models import CourseSoftware
+from .models import get_courses_licenses, get_or_create_license, get_license
 
 
 log = logging.getLogger("mitx.licenses")

lms/djangoapps/open_ended_grading/open_ended_notifications.py

 from django.conf import settings
 from xmodule.open_ended_grading_classes import peer_grading_service
-from staff_grading_service import StaffGradingService
+from .staff_grading_service import StaffGradingService
 from xmodule.open_ended_grading_classes.controller_query_service import ControllerQueryService
 import json
 from student.models import unique_id_for_user

lms/djangoapps/simplewiki/admin.py

@@ -4,7 +4,7 @@ from django import forms
 from django.contrib import admin
 from django.utils.translation import ugettext as _
 
-from models import Article, Revision, Permission, ArticleAttachment
+from .models import Article, Revision, Permission, ArticleAttachment
 
 
 class RevisionInline(admin.TabularInline):

lms/djangoapps/simplewiki/models.py

@@ -9,7 +9,7 @@ from django.db.models import signals
 from django.utils.translation import ugettext_lazy as _
 from markdown import markdown
 
-from wiki_settings import *
+from .wiki_settings import *
 from util.cache import cache
 
 

lms/djangoapps/simplewiki/views.py

@@ -14,7 +14,7 @@ from courseware.access import has_access
 from xmodule.course_module import CourseDescriptor
 from xmodule.modulestore.django import modulestore
 
-from models import Revision, Article, Namespace, CreateArticleForm, RevisionFormWithTitle, RevisionForm
+from .models import Revision, Article, Namespace, CreateArticleForm, RevisionFormWithTitle, RevisionForm
 import wiki_settings
 
 

lms/lib/comment_client/__init__.py

-from comment_client import *
-from utils import CommentClientError, CommentClientUnknownError
+from .comment_client import *
+from .utils import CommentClientError, CommentClientUnknownError

lms/lib/comment_client/comment.py

-from utils import *
+from .utils import *
 
-from thread import Thread
+from .thread import Thread
 import models
 import settings
 

lms/lib/comment_client/comment_client.py

-from comment import Comment
-from thread import Thread
-from user import User
-from commentable import Commentable
+from .comment import Comment
+from .thread import Thread
+from .user import User
+from .commentable import Commentable
 
-from utils import *
+from .utils import *
 
 import settings
 

lms/lib/comment_client/commentable.py

-from utils import *
+from .utils import *
 
 import models
 import settings

lms/lib/comment_client/models.py

-from utils import *
+from .utils import *
 
 
 class Model(object):

lms/lib/comment_client/thread.py

-from utils import *
+from .utils import *
 
 import models
 import settings

lms/lib/comment_client/user.py

-from utils import *
+from .utils import *
 
 import models
 import settings

lms/lib/loncapa/__init__.py

 #!/usr/bin/python
 
-from loncapa_check import *
+from .loncapa_check import *

lms/lib/symmath/__init__.py

-from formula import *
-from symmath_check import *
+from .formula import *
+from .symmath_check import *

lms/lib/symmath/symmath_check.py

@@ -13,7 +13,7 @@ import sys
 import string
 import re
 import traceback
-from formula import *
+from .formula import *
 import logging
 
 log = logging.getLogger(__name__)

lms/lib/symmath/test_symmath_check.py

 from unittest import TestCase
-from symmath_check import symmath_check
+from .symmath_check import symmath_check
 
 class SymmathCheckTest(TestCase):
     def test_symmath_check_integers(self):