Adapted codebase to the hsutil/hscommon split and the hsmedia --> hsaudiotag rename.

core/app.py

@@ -15,11 +15,11 @@ import subprocess
 import re
 
 from send2trash import send2trash
+from hscommon.reg import RegistrableApplication, RegistrationRequired
+from hscommon.notify import Broadcaster
 from hsutil import io, files
 from hsutil.path import Path
-from hsutil.reg import RegistrableApplication, RegistrationRequired
 from hsutil.misc import flatten, first
-from hsutil.notify import Broadcaster
 from hsutil.str import escape
 
 from . import directories, results, scanner, export, fs

core/app_cocoa.py

@@ -9,12 +9,12 @@
 import logging
 import os.path as op
 
-from hsutil import cocoa, job
-from hsutil.cocoa import install_exception_hook
-from hsutil.cocoa.objcmin import (NSNotificationCenter, NSUserDefaults,
+from hscommon import cocoa, job
+from hscommon.cocoa import install_exception_hook
+from hscommon.cocoa.objcmin import (NSNotificationCenter, NSUserDefaults,
     NSSearchPathForDirectoriesInDomains, NSApplicationSupportDirectory, NSUserDomainMask,
     NSWorkspace)
-from hsutil.reg import RegistrationRequired
+from hscommon.reg import RegistrationRequired
 
 from . import app
 

core/app_cocoa_inter.py

@@ -9,7 +9,7 @@
 
 # Common interface for all editions' dg_cocoa unit.
 
-from hsutil.cocoa.inter import signature, PyTable, PyOutline, PyGUIObject, PyRegistrable
+from hscommon.cocoa.inter import signature, PyTable, PyOutline, PyGUIObject, PyRegistrable
 
 from .gui.details_panel import DetailsPanel
 from .gui.directory_tree import DirectoryTree

core/engine.py

@@ -16,7 +16,7 @@ from unicodedata import normalize
 
 from hsutil.misc import flatten
 from hsutil.str import multi_replace
-from hsutil import job
+from hscommon import job
 
 (WEIGHT_WORDS,
 MATCH_SIMILAR_WORDS,

core/gui/base.py

@@ -7,7 +7,7 @@
 # which should be included with this package. The terms are also available at 
 # http://www.hardcoded.net/licenses/hs_license
 
-from hsutil.notify import Listener
+from hscommon.notify import Listener
 
 class GUIObject(Listener):
     def __init__(self, view, app):

core/gui/problem_dialog.py

@@ -7,7 +7,7 @@
 # which should be included with this package. The terms are also available at 
 # http://www.hardcoded.net/licenses/hs_license
 
-from hsutil.notify import Broadcaster
+from hscommon.notify import Broadcaster
 
 from .base import GUIObject
 

core/gui/problem_table.py

@@ -7,7 +7,7 @@
 # which should be included with this package. The terms are also available at 
 # http://www.hardcoded.net/licenses/hs_license
 
-from hsutil.notify import Listener
+from hscommon.notify import Listener
 from hsgui.table import GUITable, Row
 
 class ProblemTable(GUITable, Listener):

core/results.py

@@ -11,8 +11,8 @@ import re
 from lxml import etree
 
 from . import engine
-from hsutil.job import nulljob
-from hsutil.markable import Markable
+from hscommon.job import nulljob
+from hscommon.markable import Markable
 from hsutil.misc import flatten, nonone
 from hsutil.str import format_size
 from hsutil.files import FileOrPath

core/scanner.py

@@ -9,7 +9,8 @@
 import logging
 
 
-from hsutil import job, io
+from hscommon import job
+from hsutil import io
 from hsutil.misc import dedupe
 from hsutil.str import get_file_ext, rem_file_ext
 

core/tests/app_test.py

@@ -16,7 +16,7 @@ from hsutil import io
 from hsutil.path import Path
 from hsutil.decorators import log_calls
 import hsutil.files
-from hsutil.job import nulljob
+from hscommon.job import nulljob
 
 from . import data
 from .results_test import GetTestGroups

core/tests/engine_test.py

@@ -10,7 +10,7 @@ import sys
 
 from nose.tools import eq_
 
-from hsutil import job
+from hscommon import job
 from hsutil.decorators import log_calls
 from hsutil.misc import first
 from hsutil.testcase import TestCase

core/tests/scanner_test.py

@@ -8,7 +8,8 @@
 
 from nose.tools import eq_
 
-from hsutil import job, io
+from hscommon import job
+from hsutil import io
 from hsutil.path import Path
 from hsutil.testcase import TestCase