From 5e262d8bf5cb3a411528ccdad6a79ce487d697be Mon Sep 17 00:00:00 2001 From: Alon Levy Date: Sat, 1 Mar 2014 21:52:14 +0200 Subject: make exif a submodule Updates it to latest which includes a fix for a 100% hang on a jpg without any EXIF data: https://www.dropbox.com/s/m5l185qxq9w5mzk/raspberry-pi-gpio-cheat-sheet.jpg Signed-off-by: Alon Levy --- mediagoblin/tools/exif.py | 9 +++++---- mediagoblin/tools/extlib/EXIF.py | 1 - 2 files changed, 5 insertions(+), 5 deletions(-) delete mode 120000 mediagoblin/tools/extlib/EXIF.py (limited to 'mediagoblin') diff --git a/mediagoblin/tools/exif.py b/mediagoblin/tools/exif.py index 6b3639e8..acbf3179 100644 --- a/mediagoblin/tools/exif.py +++ b/mediagoblin/tools/exif.py @@ -14,10 +14,11 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -try: - from EXIF import process_file, Ratio -except ImportError: - from mediagoblin.tools.extlib.EXIF import process_file, Ratio +import sys +sys.path.append('extlib/exif') + +from EXIF import process_file +from exifread.utils import Ratio from mediagoblin.processing import BadMediaFail from mediagoblin.tools.translate import pass_to_ugettext as _ diff --git a/mediagoblin/tools/extlib/EXIF.py b/mediagoblin/tools/extlib/EXIF.py deleted file mode 120000 index 82a2fb30..00000000 --- a/mediagoblin/tools/extlib/EXIF.py +++ /dev/null @@ -1 +0,0 @@ -../../../extlib/exif/EXIF.py \ No newline at end of file -- cgit v1.2.3