From 5267093545dcc19666ceb925cbe7cedb9be0c449 Mon Sep 17 00:00:00 2001
From: Olivier Tilloy <olivier@tilloy.net>
Date: Mon, 24 Oct 2011 09:30:53 +0200
Subject: Implement a poor man’s test skipping solution to substitute
 @unittest.skipIf, which is only available starting with Python 2.7.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test/iptc.py | 7 ++++++-
 test/xmp.py  | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/test/iptc.py b/test/iptc.py
index 872990a..ed1b2f6 100644
--- a/test/iptc.py
+++ b/test/iptc.py
@@ -182,8 +182,13 @@ class TestIptcTag(unittest.TestCase):
         # Invalid values
         self.failUnlessRaises(IptcValueError, tag._convert_to_string, 'invalid')
 
-    @unittest.skipIf(pytz is None, 'install python-tz to run this test')
     def test_convert_to_string_time_with_real_timezones(self):
+        if pytz is None:
+            # Poor man’s test skipping. Starting with Python 2.7, decorators are
+            # available to implement this in a cleaner fashion
+            # (http://docs.python.org/library/unittest.html#unittest-skipping).
+            print 'Install python-tz to run this test. Skipping.'
+            return
         tag = IptcTag('Iptc.Envelope.TimeSent')
         self.assertEqual(tag.type, 'Time')
         t = pytz.timezone('UTC').localize(datetime.datetime(2011, 2, 2, 10, 52, 4))
diff --git a/test/xmp.py b/test/xmp.py
index ba5b0b6..70e0980 100644
--- a/test/xmp.py
+++ b/test/xmp.py
@@ -184,8 +184,13 @@ class TestXmpTag(unittest.TestCase):
         self.failUnlessRaises(XmpValueError, tag._convert_to_string, 'invalid', 'Date')
         self.failUnlessRaises(XmpValueError, tag._convert_to_string, None, 'Date')
 
-    @unittest.skipIf(pytz is None, 'install python-tz to run this test')
     def test_convert_to_string_date_with_real_timezones(self):
+        if pytz is None:
+            # Poor man’s test skipping. Starting with Python 2.7, decorators are
+            # available to implement this in a cleaner fashion
+            # (http://docs.python.org/library/unittest.html#unittest-skipping).
+            print 'Install python-tz to run this test. Skipping.'
+            return
         tag = XmpTag('Xmp.xmp.CreateDate')
         self.assertEqual(tag.type, 'Date')
         t = pytz.timezone('UTC').localize(datetime.datetime(2011, 2, 2, 10, 52, 4))
-- 
cgit 


From 9426a35dbba4d8ca61a59cfff472dbb7e6782157 Mon Sep 17 00:00:00 2001
From: Olivier Tilloy <olivier@tilloy.net>
Date: Mon, 24 Oct 2011 09:35:44 +0200
Subject: Substitute the use of timedelta.total_seconds() with its actual
 implementation. This method was introduced in Python 2.7.

---
 src/pyexiv2/utils.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/pyexiv2/utils.py b/src/pyexiv2/utils.py
index 9473aff..0325699 100644
--- a/src/pyexiv2/utils.py
+++ b/src/pyexiv2/utils.py
@@ -28,6 +28,9 @@
 Utilitary classes and functions.
 """
 
+# Enable true division.
+from __future__ import division
+
 import datetime
 import re
 
@@ -601,7 +604,10 @@ class DateTimeFormatter(object):
                  ``±%H:%M``
         :rtype: string
         """
-        seconds = t.total_seconds()
+        # timedelta.total_seconds() is only available starting with Python 2.7
+        # (http://docs.python.org/library/datetime.html#datetime.timedelta.total_seconds)
+        #seconds = t.total_seconds()
+        seconds = (t.microseconds + (t.seconds + t.days * 24 * 3600) * 10**6) / 10**6
         hours = int(seconds / 3600)
         minutes = abs(int((seconds - hours * 3600) / 60))
         return '%+03d:%02d' % (hours, minutes)
-- 
cgit