Cleanup and update to newer pyexiv2HEADmaster

2 files changed, 25 insertions, 25 deletions

diff --git a/exifilm.py b/exifilm.py
index 17db62d..2041ec9 100644
--- a/exifilm.py
+++ b/exifilm.py
@@ -68,7 +68,7 @@ PRIVATE_KEYS = [
     ]
 
 ISO_RE = re.compile(r'\d\d+')
-                    
+
 def to_rational(v):
     if '/' in v:
         n,d = v.split('/')
@@ -150,9 +150,9 @@ class ExiFilm(object):
         self.comments_text = self.xml.get_widget('comments')
         self.comments_buffer = gtk.TextBuffer()
         self.comments_text.set_buffer(self.comments_buffer)
-        
+
         # Keep the last selected date to provide a sane default
-        self.lastdate = None 
+        self.lastdate = None
 
         dic = {
             'on_main_window_destroy': self.window_closed,
@@ -201,36 +201,36 @@ class ExiFilm(object):
             if i>0:
                 self.file_combo.set_active(i-1)
             return True
-        
+
         if data.keyval == gtk.keysyms.Page_Down:
             i = self.file_combo.get_active()
             if i<len(self.file_store)-1:
                 self.file_combo.set_active(i+1)
             return True
-            
+
     def load(self, fn):
         fn = os.path.join(self.directory, fn)
         self.filename = fn
 
-        image = pyexiv2.Image(fn)
-        image.readMetadata()
-        keys = image.exifKeys()
+        image = pyexiv2.ImageMetadata(fn)
+        image.read()
+        keys = image.exif_keys
         self.image = image
 
         def get(key, default=''):
             if key in keys:
-                return image[key]
+                return image[key].value
             return default
 
         self.date = get('Exif.Photo.DateTimeOriginal', None)
         if self.date:
-            self.date_button.set_label(str(self.date.date()))            
+            self.date_button.set_label(str(self.date.date()))
         else:
             self.date_button.set_label('Set')
 
-        self.shutter_entry.set_text(from_rational(get('Exif.Photo.ExposureTime')))
-        self.aperture_entry.set_text(to_fstop(from_rational(get('Exif.Photo.FNumber'))))
-        self.lens_entry.set_text(from_rational(get('Exif.Photo.FocalLength')))
+        self.shutter_entry.set_text(str(get('Exif.Photo.ExposureTime')))
+        self.aperture_entry.set_text(to_fstop(str(get('Exif.Photo.FNumber'))))
+        self.lens_entry.set_text(str(get('Exif.Photo.FocalLength')))
 
         self.description_entry.set_text(get('Exif.Image.ImageDescription'))
         extras, comments = decode_comments(get('Exif.Photo.UserComment'))
@@ -284,13 +284,13 @@ class ExiFilm(object):
             extras[FRONT_MOVEMENTS] = self.front_movements
         if self.rear_movements:
             extras[REAR_MOVEMENTS] = self.rear_movements
-        
+
         bounds = self.comments_buffer.get_bounds()
         v = self.comments_buffer.get_text(bounds[0], bounds[1])
         if v or extras:
             self.image['Exif.Photo.UserComment'] = encode_comments(extras, v)
-        
-        self.image.writeMetadata()
+
+        self.image.write()
 
     def window_closed(self, widget, data=None):
         if self.image:
@@ -326,7 +326,7 @@ class ExiFilm(object):
             self.front_button.set_label(self.front_movements)
         else:
             self.front_button.set_label('None')
-            
+
     def rear_clicked(self, widget, data=None):
         moves = self.rear_movements.split('/')
         moves = self.get_movements(moves)
@@ -354,7 +354,7 @@ class ExiFilm(object):
             tree_store.append(None, (m,))
             if m in orig_movements:
                 tree_view.get_selection().select_path((i,))
-            
+
         r = dialog.run()
         if r:
             store, rows = tree_view.get_selection().get_selected_rows()
diff --git a/printrecord.py b/printrecord.py
index 65dc48a..f4ada9c 100644
--- a/printrecord.py
+++ b/printrecord.py
@@ -28,23 +28,23 @@ import lfrecord
 class MyImage(object):
     def __init__(self, fn):
         if fn:
-            image = pyexiv2.Image(fn)
-            image.readMetadata()
-            keys = image.exifKeys()
+            image = pyexiv2.ImageMetadata(fn)
+            image.read()
+            keys = image.exif_keys
             self.image = image
         else:
             keys = []
 
         def get(key, default=''):
             if key in keys:
-                return image[key]
+                return image[key].value
             return default
 
         self.date = get('Exif.Photo.DateTimeOriginal', '')
 
-        self.shutter=from_rational(get('Exif.Photo.ExposureTime'))
-        self.aperture=to_fstop(from_rational(get('Exif.Photo.FNumber')))
-        self.lens=from_rational(get('Exif.Photo.FocalLength'))
+        self.shutter=str(get('Exif.Photo.ExposureTime'))
+        self.aperture=to_fstop(str(get('Exif.Photo.FNumber')))
+        self.lens=str(get('Exif.Photo.FocalLength'))
 
         self.description=get('Exif.Image.ImageDescription')
         extras, comments = decode_comments(get('Exif.Photo.UserComment'))