simplified imports from tincan in test files

Chaim-Leib Halbert · Chaim-Leib Halbert · commit 5f21ff9b1281 · 2014-06-26T15:12:07.000-05:00
diff --git a/test/about_test.py b/test/about_test.py
@@ -18,8 +18,7 @@
     from main import setup_tincan_path
     setup_tincan_path()
 from test_utils import TinCanBaseTestCase
-from tincan.version import Version
-from tincan.about import About
+from tincan import Version, About
 
 
 class AboutTest(TinCanBaseTestCase):
diff --git a/test/activity_test.py b/test/activity_test.py
@@ -17,10 +17,12 @@
 if __name__ == '__main__':
     from main import setup_tincan_path
     setup_tincan_path()
-from tincan.activity import Activity
-from tincan.activity_definition import ActivityDefinition
-from tincan.interaction_component_list import InteractionComponentList
-from tincan.language_map import LanguageMap
+from tincan import (
+    Activity,
+    ActivityDefinition,
+    InteractionComponentList,
+    LanguageMap,
+)
 
 
 class ActivityTest(unittest.TestCase):
diff --git a/test/activitydefinition_test.py b/test/activitydefinition_test.py
@@ -17,10 +17,12 @@
 if __name__ == '__main__':
     from main import setup_tincan_path
     setup_tincan_path()
-from tincan.activity_definition import ActivityDefinition
-from tincan.language_map import LanguageMap
-from tincan.interaction_component_list import InteractionComponentList
-from tincan.interaction_component import InteractionComponent
+from tincan import (
+    ActivityDefinition,
+    LanguageMap,
+    InteractionComponentList,
+    InteractionComponent,
+)
 
 
 class ActivityDefinitionTest(unittest.TestCase):
diff --git a/test/activitylist_test.py b/test/activitylist_test.py
@@ -17,8 +17,7 @@
 if __name__ == '__main__':
     from main import setup_tincan_path
     setup_tincan_path()
-from tincan.activity_list import ActivityList
-from tincan.activity import Activity
+from tincan import ActivityList, Activity
 
 
 class ActivityListTest(unittest.TestCase):
diff --git a/test/agent_test.py b/test/agent_test.py
@@ -17,8 +17,7 @@
 if __name__ == '__main__':
     from main import setup_tincan_path
     setup_tincan_path()
-from tincan.agent import Agent
-from tincan.agent_account import AgentAccount
+from tincan import Agent, AgentAccount
 
 
 class AgentTest(unittest.TestCase):
diff --git a/test/attachment_test.py b/test/attachment_test.py
@@ -17,8 +17,8 @@
 if __name__ == '__main__':
     from main import setup_tincan_path
     setup_tincan_path()
-from tincan.attachment import Attachment
-from tincan.language_map import LanguageMap
+from tincan import Attachment, LanguageMap
+
 
 class AttachmentTest(unittest.TestCase):
 
diff --git a/test/context_test.py b/test/context_test.py
@@ -17,13 +17,15 @@
 if __name__ == '__main__':
     from main import setup_tincan_path
     setup_tincan_path()
-from tincan.context import Context
-from tincan.context_activities import ContextActivities
-from tincan.activity import Activity
-from tincan.agent import Agent
-from tincan.statement_ref import StatementRef
-from tincan.extensions import Extensions
-from tincan.group import Group
+from tincan import (
+    Context,
+    ContextActivities,
+    Activity,
+    Agent,
+    StatementRef,
+    Extensions,
+    Group,
+)
 import uuid
 import re
 
diff --git a/test/contextactivities_test.py b/test/contextactivities_test.py
@@ -17,9 +17,7 @@
 if __name__ == '__main__':
     from main import setup_tincan_path
     setup_tincan_path()
-from tincan.context_activities import ContextActivities
-from tincan.activity import Activity
-from tincan.activity_list import ActivityList
+from tincan import ContextActivities, Activity, ActivityList
 
 
 class ContextActivitiesTest(unittest.TestCase):
diff --git a/test/extensions_test.py b/test/extensions_test.py
@@ -17,7 +17,7 @@
 if __name__ == '__main__':
     from main import setup_tincan_path
     setup_tincan_path()
-from tincan.extensions import Extensions
+from tincan import Extensions
 from test_utils import TinCanBaseTestCase
 
 
diff --git a/test/group_test.py b/test/group_test.py
@@ -17,8 +17,8 @@
 if __name__ == '__main__':
     from main import setup_tincan_path
     setup_tincan_path()
-from tincan.group import Group
-from tincan.agent import Agent
+from tincan import Group, Agent
+
 
 class GroupTest(unittest.TestCase):
 
diff --git a/test/http_request_test.py b/test/http_request_test.py
@@ -17,7 +17,7 @@
 if __name__ == '__main__':
     from main import setup_tincan_path
     setup_tincan_path()
-from tincan.http_request import HTTPRequest
+from tincan import HTTPRequest
 
 
 class HTTPRequestTest(unittest.TestCase):
diff --git a/test/interactioncomponent_test.py b/test/interactioncomponent_test.py
@@ -17,8 +17,7 @@
 if __name__ == '__main__':
     from main import setup_tincan_path
     setup_tincan_path()
-from tincan.interaction_component import InteractionComponent
-from tincan.language_map import LanguageMap
+from tincan import InteractionComponent, LanguageMap
 
 
 class InteractionComponentTest(unittest.TestCase):
diff --git a/test/interactioncomponentlist_test.py b/test/interactioncomponentlist_test.py
@@ -17,9 +17,7 @@
 if __name__ == '__main__':
     from main import setup_tincan_path
     setup_tincan_path()
-from tincan.interaction_component_list import InteractionComponentList
-from tincan.interaction_component import InteractionComponent
-from tincan.language_map import LanguageMap
+from tincan import InteractionComponentList, InteractionComponent, LanguageMap
 
 
 class InteractionComponentListTest(unittest.TestCase):
diff --git a/test/languagemap_test.py b/test/languagemap_test.py
@@ -17,7 +17,7 @@
 if __name__ == '__main__':
     from main import setup_tincan_path
     setup_tincan_path()
-from tincan.language_map import LanguageMap
+from tincan import LanguageMap
 
 
 class LanguageMapTest(unittest.TestCase):
diff --git a/test/lrs_response_test.py b/test/lrs_response_test.py
@@ -18,8 +18,7 @@
 if __name__ == '__main__':
     from main import setup_tincan_path
     setup_tincan_path()
-from tincan.lrs_response import LRSResponse
-from tincan.http_request import HTTPRequest
+from tincan import LRSResponse, HTTPRequest
 
 
 class LRSResponseTest(unittest.TestCase):
diff --git a/test/remote_lrs_test.py b/test/remote_lrs_test.py
@@ -21,25 +21,27 @@
 if __name__ == '__main__':
     from main import setup_tincan_path
     setup_tincan_path()
-from tincan.remote_lrs import RemoteLRS
-from tincan.lrs_response import LRSResponse
-from tincan.version import Version
 from resources import lrs_properties
-from tincan.activity import Activity
-from tincan.activity_definition import ActivityDefinition
-from tincan.language_map import LanguageMap
-from tincan.verb import Verb
-from tincan.agent import Agent
-from tincan.statement import Statement
-from tincan.context import Context
-from tincan.score import Score
-from tincan.group import Group
-from tincan.base import Base
-from tincan.result import Result
-from tincan.substatement import SubStatement
-from tincan.statement_ref import StatementRef
-from tincan.about import About
-from tincan.statements_result import StatementsResult
+from tincan import (
+    RemoteLRS,
+    LRSResponse,
+    Version,
+    Activity,
+    ActivityDefinition,
+    LanguageMap,
+    Verb,
+    Agent,
+    Statement,
+    Context,
+    Score,
+    Group,
+    Base,
+    Result,
+    SubStatement,
+    StatementRef,
+    About,
+    StatementsResult,
+)
 from tincan.documents import (
     StateDocument,
     ActivityProfileDocument,
diff --git a/test/result_test.py b/test/result_test.py
@@ -18,9 +18,7 @@
 if __name__ == '__main__':
     from main import setup_tincan_path
     setup_tincan_path()
-from tincan.score import Score
-from tincan.extensions import Extensions
-from tincan.result import Result
+from tincan import Score, Extensions, Result
 from test_utils import TinCanBaseTestCase
 
 
diff --git a/test/score_test.py b/test/score_test.py
@@ -17,7 +17,7 @@
 if __name__ == '__main__':
     from main import setup_tincan_path
     setup_tincan_path()
-from tincan.score import Score
+from tincan import Score
 from test_utils import TinCanBaseTestCase
 
 
diff --git a/test/statement_test.py b/test/statement_test.py
@@ -20,16 +20,19 @@
 if __name__ == '__main__':
     from main import setup_tincan_path
     setup_tincan_path()
-from tincan.statement import Statement
-from tincan.agent import Agent
-from tincan.group import Group
-from tincan.verb import Verb
-from tincan.result import Result
-from tincan.context import Context
-from tincan.attachment import Attachment
-from tincan.substatement import SubStatement
-from tincan.activity import Activity
-from tincan.statement_ref import StatementRef
+from tincan import (
+    Statement,
+    Agent,
+    Group,
+    Verb,
+    Result,
+    Context,
+    Attachment,
+    SubStatement,
+    Activity,
+    StatementRef,
+)
+
 
 class StatementTest(unittest.TestCase):
 
diff --git a/test/statementref_test.py b/test/statementref_test.py
@@ -17,7 +17,8 @@
 if __name__ == '__main__':
     from main import setup_tincan_path
     setup_tincan_path()
-from tincan.statement_ref import StatementRef
+from tincan import StatementRef
+
 
 class StatementRefTest(unittest.TestCase):
 
diff --git a/test/statements_result_test.py b/test/statements_result_test.py
@@ -18,8 +18,7 @@
 if __name__ == '__main__':
     from main import setup_tincan_path
     setup_tincan_path()
-from tincan.statements_result import StatementsResult
-from tincan.statement import Statement
+from tincan import StatementsResult, Statement
 from test_utils import TinCanBaseTestCase
 
 
diff --git a/test/substatement_test.py b/test/substatement_test.py
@@ -16,12 +16,14 @@
 if __name__ == '__main__':
     from main import setup_tincan_path
     setup_tincan_path()
-from tincan.agent import Agent
-from tincan.group import Group
-from tincan.verb import Verb
-from tincan.statement_ref import StatementRef
-from tincan.activity import Activity
-from tincan.substatement import SubStatement
+from tincan import (
+    Agent,
+    Group,
+    Verb,
+    StatementRef,
+    Activity,
+    SubStatement,
+)
 
 class SubStatementTest(unittest.TestCase):
 
diff --git a/test/test_utils.py b/test/test_utils.py
@@ -17,7 +17,7 @@
 if __name__ == '__main__':
     from main import setup_tincan_path
     setup_tincan_path()
-from tincan.version import Version
+from tincan import Version
 
 
 class TinCanBaseTestCase(unittest.TestCase):
diff --git a/test/typedlist_test.py b/test/typedlist_test.py
@@ -17,7 +17,7 @@
 if __name__ == '__main__':
     from main import setup_tincan_path
     setup_tincan_path()
-from tincan.typed_list import TypedList
+from tincan import TypedList
 
 
 class TypedListTest(unittest.TestCase):
diff --git a/test/verb_test.py b/test/verb_test.py
@@ -17,8 +17,7 @@
 if __name__ == '__main__':
     from main import setup_tincan_path
     setup_tincan_path()
-from tincan.verb import Verb
-from tincan.language_map import LanguageMap
+from tincan import Verb, LanguageMap
 
 
 class VerbTest(unittest.TestCase):
diff --git a/test/version_test.py b/test/version_test.py
@@ -17,7 +17,7 @@
 if __name__ == '__main__':
     from main import setup_tincan_path
     setup_tincan_path()
-from tincan.version import Version
+from tincan import Version
 
 
 class VersionTest(unittest.TestCase):
