From cd2a61d926344e5f6fcdd1a855d2486ea53479a4 Mon Sep 17 00:00:00 2001
From: Virgil Dupras <hsoft@hardcoded.net>
Date: Sun, 23 Jan 2011 12:12:28 +0100
Subject: [PATCH] Removed py2app import workarounds, they're not needed
 anymore.

---
 cocoa/me/dg_cocoa.py | 12 ------------
 cocoa/pe/dg_cocoa.py |  9 ---------
 cocoa/se/dg_cocoa.py |  7 -------
 3 files changed, 28 deletions(-)

diff --git a/cocoa/me/dg_cocoa.py b/cocoa/me/dg_cocoa.py
index 5fdad6f2..55c5acb6 100644
--- a/cocoa/me/dg_cocoa.py
+++ b/cocoa/me/dg_cocoa.py
@@ -13,18 +13,6 @@ from core.app_cocoa_inter import PyDupeGuruBase, PyDetailsPanel
 from core_me.app_cocoa import DupeGuruME
 from core.scanner import ScanType
 
-# Fix py2app imports which chokes on relative imports and other stuff
-import core_me.app_cocoa, core_me.data, core_me.fs, core_me.scanner
-import hsaudiotag.aiff, hsaudiotag.flac, hsaudiotag.genres, hsaudiotag.id3v1,\
-    hsaudiotag.id3v2, hsaudiotag.mp4, hsaudiotag.mpeg, hsaudiotag.ogg, hsaudiotag.wma
-from hsaudiotag import aiff, flac, genres, id3v1, id3v2, mp4, mpeg, ogg, wma
-import hscommon.conflict
-import core.engine, core.fs, core.app
-import xml.etree.ElementPath
-import gzip
-import aem.kae
-import appscript.defaultterminology
-
 class PyDupeGuru(PyDupeGuruBase):
     def init(self):
         self = super(PyDupeGuru,self).init()
diff --git a/cocoa/pe/dg_cocoa.py b/cocoa/pe/dg_cocoa.py
index 3281fb76..05337934 100644
--- a/cocoa/pe/dg_cocoa.py
+++ b/cocoa/pe/dg_cocoa.py
@@ -10,15 +10,6 @@ install_cocoa_trans()
 from core.app_cocoa_inter import PyDupeGuruBase, PyDetailsPanel
 from core_pe import app_cocoa as app_pe_cocoa
 
-# Fix py2app imports which chokes on relative imports and other stuff
-import hscommon.conflict
-import core.engine, core.fs, core.app
-import core_pe.block, core_pe.cache, core_pe.matchbase, core_pe.data, core_pe._block_osx
-import xml.etree.ElementPath
-import gzip
-import aem.kae
-import appscript.defaultterminology
-
 class PyDupeGuru(PyDupeGuruBase):
     def init(self):
         self = super(PyDupeGuru, self).init()
diff --git a/cocoa/se/dg_cocoa.py b/cocoa/se/dg_cocoa.py
index 294db0aa..f68eb233 100644
--- a/cocoa/se/dg_cocoa.py
+++ b/cocoa/se/dg_cocoa.py
@@ -13,13 +13,6 @@ from core.scanner import ScanType
 from core.app_cocoa_inter import PyDupeGuruBase, PyDetailsPanel
 from core_se.app_cocoa import DupeGuru
 
-# Fix py2app imports with chokes on relative imports and other stuff
-import hscommon.conflict
-import core.engine, core.fs, core.app
-import core_se.fs, core_se.data
-import xml.etree.ElementPath
-import gzip
-
 class PyDupeGuru(PyDupeGuruBase):
     def init(self):
         self = super(PyDupeGuru,self).init()