mirror of
https://github.com/arsenetar/dupeguru.git
synced 2026-02-04 20:31:38 +00:00
Changed dupeguru and dupeguru_* external references to core and core_* references.
--HG-- extra : convert_revision : svn%3Ac306627e-7827-47d3-bdf0-9a457c9553a1/trunk%40278
This commit is contained in:
@@ -8,12 +8,12 @@
|
||||
import objc
|
||||
from AppKit import *
|
||||
|
||||
from dupeguru_se.app_cocoa import DupeGuru
|
||||
from dupeguru import scanner
|
||||
from core_se.app_cocoa import DupeGuru
|
||||
from core import scanner
|
||||
|
||||
# Fix py2app imports with chokes on relative imports
|
||||
from dupeguru_se import fs, data
|
||||
from dupeguru import app, app_cocoa, data, directories, engine, export, ignore, results, fs
|
||||
from core_se import fs, data
|
||||
from core import app, app_cocoa, data, directories, engine, export, ignore, results, fs
|
||||
from hsutil import conflict
|
||||
|
||||
class PyApp(NSObject):
|
||||
|
||||
@@ -18,9 +18,9 @@ from hsutil import io
|
||||
from hsutil.path import Path
|
||||
from hsutil.str import get_file_ext
|
||||
|
||||
from dupeguru import fs
|
||||
from dupeguru.app_cocoa import DupeGuru as DupeGuruBase
|
||||
from dupeguru.directories import Directories as DirectoriesBase, STATE_EXCLUDED
|
||||
from core import fs
|
||||
from core.app_cocoa import DupeGuru as DupeGuruBase
|
||||
from core.directories import Directories as DirectoriesBase, STATE_EXCLUDED
|
||||
from . import data
|
||||
from .fs import Bundle as BundleBase
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
# http://www.hardcoded.net/licenses/hs_license
|
||||
|
||||
from hsutil.str import format_size
|
||||
from dupeguru.data import (format_path, format_timestamp, format_words, format_perc,
|
||||
from core.data import (format_path, format_timestamp, format_words, format_perc,
|
||||
format_dupe_count, cmp_value)
|
||||
|
||||
COLUMNS = [
|
||||
|
||||
@@ -13,7 +13,7 @@ import hashlib
|
||||
from hsutil import io
|
||||
from hsutil.misc import nonone
|
||||
|
||||
from dupeguru import fs
|
||||
from core import fs
|
||||
|
||||
class Bundle(fs.File):
|
||||
"""This class is for Mac OSX bundles (.app). Bundles are seen by the OS as
|
||||
|
||||
@@ -13,8 +13,8 @@ import hashlib
|
||||
from nose.tools import eq_
|
||||
|
||||
from hsutil.testcase import TestCase
|
||||
from dupeguru.fs import File
|
||||
from dupeguru.tests.directories_test import create_fake_fs
|
||||
from core.fs import File
|
||||
from core.tests.directories_test import create_fake_fs
|
||||
|
||||
from .. import fs
|
||||
|
||||
|
||||
@@ -7,8 +7,8 @@
|
||||
# which should be included with this package. The terms are also available at
|
||||
# http://www.hardcoded.net/licenses/hs_license
|
||||
|
||||
from dupeguru_se import data
|
||||
from dupeguru.directories import Directories as DirectoriesBase, STATE_EXCLUDED
|
||||
from core_se import data
|
||||
from core.directories import Directories as DirectoriesBase, STATE_EXCLUDED
|
||||
|
||||
from base.app import DupeGuru as DupeGuruBase
|
||||
from details_dialog import DetailsDialog
|
||||
|
||||
@@ -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 dupeguru.scanner import SCAN_TYPE_FILENAME, SCAN_TYPE_CONTENT
|
||||
from core.scanner import SCAN_TYPE_FILENAME, SCAN_TYPE_CONTENT
|
||||
|
||||
from base.preferences import Preferences as PreferencesBase
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@ from PyQt4.QtGui import QDialog, QDialogButtonBox
|
||||
|
||||
from hsutil.misc import tryint
|
||||
|
||||
from dupeguru.scanner import SCAN_TYPE_FILENAME, SCAN_TYPE_CONTENT
|
||||
from core.scanner import SCAN_TYPE_FILENAME, SCAN_TYPE_CONTENT
|
||||
|
||||
from preferences_dialog_ui import Ui_PreferencesDialog
|
||||
import preferences
|
||||
|
||||
Reference in New Issue
Block a user