Adapted to the job-related code moving to the 'jobprogress' package.

core/app_cocoa.py

@@ -9,7 +9,8 @@
 import logging
 import os.path as op
 
-from hscommon import cocoa, job
+from jobprogress import job
+from hscommon import cocoa
 from hscommon.cocoa import install_exception_hook
 from hscommon.cocoa.objcmin import (NSNotificationCenter, NSUserDefaults,
     NSSearchPathForDirectoriesInDomains, NSApplicationSupportDirectory, NSUserDomainMask,

core/engine.py

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

core/results.py

@@ -11,7 +11,7 @@ import re
 from xml.etree import ElementTree as ET
 
 from . import engine
-from hscommon.job import nulljob
+from jobprogress.job import nulljob
 from hscommon.markable import Markable
 from hsutil.misc import flatten, nonone
 from hsutil.str import format_size

core/scanner.py

@@ -9,7 +9,7 @@
 import logging
 import re
 
-from hscommon import job
+from jobprogress 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

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

core/tests/engine_test.py

@@ -8,7 +8,7 @@
 
 import sys
 
-from hscommon import job
+from jobprogress import job
 from hsutil.decorators import log_calls
 from hsutil.misc import first
 from hsutil.testutil import eq_

core/tests/scanner_test.py

@@ -6,8 +6,7 @@
 # which should be included with this package. The terms are also available at 
 # http://www.hardcoded.net/licenses/bsd_license
 
-
-from hscommon import job
+from jobprogress import job
 from hsutil import io
 from hsutil.path import Path
 from hsutil.testutil import eq_