From 26dd2d0e8e589a7303f8dbae5ca6d6d8e3c92450 Mon Sep 17 00:00:00 2001 From: Virgil Dupras Date: Mon, 1 Mar 2010 04:15:27 -0800 Subject: [PATCH] Updated py2app workaround in dg_cocoa for lxml. --- cocoa/me/dg_cocoa.py | 4 +++- cocoa/pe/dg_cocoa.py | 4 +++- cocoa/se/dg_cocoa.py | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/cocoa/me/dg_cocoa.py b/cocoa/me/dg_cocoa.py index 1a837336..cd9d07ef 100644 --- a/cocoa/me/dg_cocoa.py +++ b/cocoa/me/dg_cocoa.py @@ -11,9 +11,11 @@ from core_me.app_cocoa import DupeGuruME from core.scanner import (SCAN_TYPE_FILENAME, SCAN_TYPE_FIELDS, SCAN_TYPE_FIELDS_NO_ORDER, SCAN_TYPE_TAG, SCAN_TYPE_CONTENT, SCAN_TYPE_CONTENT_AUDIO) -# Fix py2app imports which chokes on relative imports +# Fix py2app imports which chokes on relative imports and other stuff from core_me import app_cocoa, data, fs, scanner from hsmedia import aiff, flac, genres, id3v1, id3v2, mp4, mpeg, ogg, wma +from lxml import etree, _elementpath +import gzip class PyDupeGuru(PyDupeGuruBase): def init(self): diff --git a/cocoa/pe/dg_cocoa.py b/cocoa/pe/dg_cocoa.py index 6a705864..43921a17 100644 --- a/cocoa/pe/dg_cocoa.py +++ b/cocoa/pe/dg_cocoa.py @@ -7,8 +7,10 @@ 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 +# Fix py2app imports which chokes on relative imports and other stuff from core_pe import block, cache, matchbase, data, _block_osx +from lxml import etree, _elementpath +import gzip class PyDupeGuru(PyDupeGuruBase): def init(self): diff --git a/cocoa/se/dg_cocoa.py b/cocoa/se/dg_cocoa.py index c3626f30..d50dc1f5 100644 --- a/cocoa/se/dg_cocoa.py +++ b/cocoa/se/dg_cocoa.py @@ -10,8 +10,10 @@ from core import scanner from core.app_cocoa_inter import PyDupeGuruBase, PyDetailsPanel from core_se.app_cocoa import DupeGuru -# Fix py2app imports with chokes on relative imports +# Fix py2app imports with chokes on relative imports and other stuff from core_se import fs, data +from lxml import etree, _elementpath +import gzip class PyDupeGuru(PyDupeGuruBase): def init(self):