← Back to branch summary

~ubuntu-branches/ubuntu/natty/moin/natty-updates

« back to all changes in this revision

Viewing changes to MoinMoin/filter/image_jpeg.py

  • Committer: Bazaar Package Importer
  • Author(s): Jonas Smedegaard
  • Date: 2008-06-22 21:17:13 UTC
  • mfrom: (0.9.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20080622211713-fpo2zrq3s5dfecxg
Tags: 1.7.0-3
Simplify /etc/moin/wikilist format: "USER URL" (drop unneeded middle
CONFIG_DIR that was wrongly advertised as DATA_DIR).  Make
moin-mass-migrate handle both formats and warn about deprecation of
the old one.

Show diffs side-by-side

added added

removed removed

Lines of Context:
MoinMoin/filter/image_jpeg.py
2
2
"""
3
3
    MoinMoin - image/jpeg Filter
4
4
 
5
 
    @copyright: 2006 by ThomasWaldmann MoinMoin:ThomasWaldmann
 
5
    @copyright: 2006 MoinMoin:ThomasWaldmann
6
6
    @license: GNU GPL, see COPYING for details.
7
7
"""
8
 
import EXIF
 
8
from MoinMoin.filter import EXIF
9
9
 
10
10
def execute(indexobj, filename):
11
11
    """ Extract some EXIF data """
23
23
        except:
24
24
            pass
25
25
        data = str(tags).decode('utf-8')
26
 
    except (ValueError, TypeError), err: # EXIF throws ValueError on unknown tags
27
 
                                         #             TypeError on other occassions
 
26
    except (ValueError, TypeError, KeyError): # EXIF throws ValueError on unknown tags
 
27
                                              # TypeError on other occassions
 
28
                                              # KeyError too
28
29
        data = u''
29
30
    return data
30
31