Merge pull request #74 from chaimleib-scorm/master

simplified imports from external modules; package-level docstring, other docstring edits

Author: brianjmiller

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):

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):

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):

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):

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):

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):
 

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
 

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):

test/documents/activity_profile_document_test.py

@@ -22,10 +22,12 @@
     sys.path.insert(0, dirname(dirname(dirname(abspath(__file__)))))
     from test.main import setup_tincan_path
     setup_tincan_path()
-from tincan.documents import ActivityProfileDocument
-from tincan.activity import Activity
-from tincan.activity_definition import ActivityDefinition
-from tincan.language_map import LanguageMap
+from tincan import (
+    ActivityProfileDocument,
+    Activity,
+    ActivityDefinition,
+    LanguageMap,
+)
 
 
 class ActivityProfileDocumentTest(unittest.TestCase):

test/documents/agent_profile_document_test.py

@@ -22,8 +22,7 @@
     sys.path.insert(0, dirname(dirname(dirname(abspath(__file__)))))
     from test.main import setup_tincan_path
     setup_tincan_path()
-from tincan.documents import AgentProfileDocument
-from tincan.agent import Agent
+from tincan import AgentProfileDocument, Agent
 
 
 class AgentProfileDocumentTest(unittest.TestCase):