From ddf9dc9f14a17747349513028e080f00ab6ad49e Mon Sep 17 00:00:00 2001 From: Nick Hall Date: Sat, 23 Feb 2013 23:36:12 +0000 Subject: [PATCH] 6408: Display GExiv2 version rather than pyexiv2 version svn: r21388 --- gramps/grampsapp.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/gramps/grampsapp.py b/gramps/grampsapp.py index 4e54e7dc8..4373103f0 100644 --- a/gramps/grampsapp.py +++ b/gramps/grampsapp.py @@ -240,14 +240,13 @@ def show_settings(): osmgpsmap_str = 'not found' try: - import pyexiv2 + from gi.repository import GExiv2 try: - pyexiv2_str = '%d.%d.%d' % pyexiv2.version_info - except :# any failure to 'get' the version - pyexiv2_str = 'unknown version' - + gexiv2_str = GExiv2._version + except: # any failure to 'get' the version + gexiv2_str = 'unknown version' except ImportError: - pyexiv2_str = 'not found' + gexiv2_str = 'not found' from .gen.config import config usebsddb3 = config.get('preferences.use-bsddb3') or sys.version_info[0] >= 3 @@ -320,7 +319,7 @@ def show_settings(): print (' cairo : %s' % cairover_str) print (' pycairo : %s' % pycairover_str) print (' osmgpsmap : %s' % osmgpsmap_str) - print (' pyexiv2 : %s' % pyexiv2_str) + print (' GExiv2 : %s' % gexiv2_str) print (' o.s. : %s' % sys.platform) if kernel: print (' kernel : %s' % kernel)