From 464631c0d67c79a95da9d5bc9b9f11ecc54242cf Mon Sep 17 00:00:00 2001 From: Anna Schumaker Date: Mon, 11 Mar 2019 10:03:02 -0400 Subject: [PATCH] curds: Clean up package imports Create some shortcuts to make the interface easier to work with. Signed-off-by: Anna Schumaker --- curds/__init__.py | 10 ++++++++++ test_emmental.py | 12 +++++------- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/curds/__init__.py b/curds/__init__.py index f11a543..dcc3c3b 100644 --- a/curds/__init__.py +++ b/curds/__init__.py @@ -1 +1,11 @@ # Copyright 2019 (c) Anna Schumaker. +from . import data +from . import playlist +from . import tags +from . import threadqueue + +Album = tags.Album +DataFile = data.DataFile +Playlist = playlist.playlist.Playlist +ThreadQueue = threadqueue.ThreadQueue +Track = tags.Track diff --git a/test_emmental.py b/test_emmental.py index b0e0a00..f99ebd0 100644 --- a/test_emmental.py +++ b/test_emmental.py @@ -4,10 +4,8 @@ import unittest class TestEmmental(unittest.TestCase): def test_import_curds(self): - self.assertIsNotNone(curds) - self.assertIsNotNone(curds.data) - self.assertIsNotNone(curds.tags) - self.assertIsNotNone(curds.threadqueue) - self.assertIsNotNone(curds.playlist) - self.assertIsNotNone(curds.playlist.library) - self.assertIsNotNone(curds.playlist.playlist) + self.assertEqual(curds.Album, curds.tags.Album) + self.assertEqual(curds.DataFile, curds.data.DataFile) + self.assertEqual(curds.Playlist, curds.playlist.playlist.Playlist) + self.assertEqual(curds.ThreadQueue, curds.threadqueue.ThreadQueue) + self.assertEqual(curds.Track, curds.tags.Track)