From eb09afbc9968d7878c7d9d08ebbbb0e37c9cb90f Mon Sep 17 00:00:00 2001 From: Benny Malengier Date: Thu, 15 Nov 2012 10:41:15 +0000 Subject: [PATCH] 2620: GEPS 031: Python 3 support - 3.2 Python 3 needs absolute import after reload in plugins dir, but a dir may not be called import So import is renamed to importer svn: r20660 --- .../plugins/{import => importer}/__init__.py | 0 .../{import => importer}/import.gpr.py | 0 .../plugins/{import => importer}/importcsv.py | 0 .../{import => importer}/importgedcom.glade | 0 .../{import => importer}/importgedcom.py | 0 .../{import => importer}/importgeneweb.py | 0 .../{import => importer}/importgpkg.py | 2 +- .../{import => importer}/importgrdb.py | 0 .../{import => importer}/importprogen.py | 0 .../{import => importer}/importvcard.py | 0 .../plugins/{import => importer}/importxml.py | 0 .../test/importVCard_test.py | 0 po/POTFILES.in | 20 +++++++++---------- po/POTFILES.skip | 4 ++-- setup.py | 2 +- 15 files changed, 14 insertions(+), 14 deletions(-) rename gramps/plugins/{import => importer}/__init__.py (100%) rename gramps/plugins/{import => importer}/import.gpr.py (100%) rename gramps/plugins/{import => importer}/importcsv.py (100%) rename gramps/plugins/{import => importer}/importgedcom.glade (100%) rename gramps/plugins/{import => importer}/importgedcom.py (100%) rename gramps/plugins/{import => importer}/importgeneweb.py (100%) rename gramps/plugins/{import => importer}/importgpkg.py (98%) rename gramps/plugins/{import => importer}/importgrdb.py (100%) rename gramps/plugins/{import => importer}/importprogen.py (100%) rename gramps/plugins/{import => importer}/importvcard.py (100%) rename gramps/plugins/{import => importer}/importxml.py (100%) rename gramps/plugins/{import => importer}/test/importVCard_test.py (100%) diff --git a/gramps/plugins/import/__init__.py b/gramps/plugins/importer/__init__.py similarity index 100% rename from gramps/plugins/import/__init__.py rename to gramps/plugins/importer/__init__.py diff --git a/gramps/plugins/import/import.gpr.py b/gramps/plugins/importer/import.gpr.py similarity index 100% rename from gramps/plugins/import/import.gpr.py rename to gramps/plugins/importer/import.gpr.py diff --git a/gramps/plugins/import/importcsv.py b/gramps/plugins/importer/importcsv.py similarity index 100% rename from gramps/plugins/import/importcsv.py rename to gramps/plugins/importer/importcsv.py diff --git a/gramps/plugins/import/importgedcom.glade b/gramps/plugins/importer/importgedcom.glade similarity index 100% rename from gramps/plugins/import/importgedcom.glade rename to gramps/plugins/importer/importgedcom.glade diff --git a/gramps/plugins/import/importgedcom.py b/gramps/plugins/importer/importgedcom.py similarity index 100% rename from gramps/plugins/import/importgedcom.py rename to gramps/plugins/importer/importgedcom.py diff --git a/gramps/plugins/import/importgeneweb.py b/gramps/plugins/importer/importgeneweb.py similarity index 100% rename from gramps/plugins/import/importgeneweb.py rename to gramps/plugins/importer/importgeneweb.py diff --git a/gramps/plugins/import/importgpkg.py b/gramps/plugins/importer/importgpkg.py similarity index 98% rename from gramps/plugins/import/importgpkg.py rename to gramps/plugins/importer/importgpkg.py index 529e08f78..e8c6c88f0 100644 --- a/gramps/plugins/import/importgpkg.py +++ b/gramps/plugins/importer/importgpkg.py @@ -49,7 +49,7 @@ log = logging.getLogger(".ReadPkg") from gramps.gen.const import XMLFILE from gramps.gen.utils.file import media_path ## we need absolute import as this is dynamically loaded: -from gramps.plugins.importers.importxml import importData +from gramps.plugins.importer.importxml import importData #------------------------------------------------------------------------- # diff --git a/gramps/plugins/import/importgrdb.py b/gramps/plugins/importer/importgrdb.py similarity index 100% rename from gramps/plugins/import/importgrdb.py rename to gramps/plugins/importer/importgrdb.py diff --git a/gramps/plugins/import/importprogen.py b/gramps/plugins/importer/importprogen.py similarity index 100% rename from gramps/plugins/import/importprogen.py rename to gramps/plugins/importer/importprogen.py diff --git a/gramps/plugins/import/importvcard.py b/gramps/plugins/importer/importvcard.py similarity index 100% rename from gramps/plugins/import/importvcard.py rename to gramps/plugins/importer/importvcard.py diff --git a/gramps/plugins/import/importxml.py b/gramps/plugins/importer/importxml.py similarity index 100% rename from gramps/plugins/import/importxml.py rename to gramps/plugins/importer/importxml.py diff --git a/gramps/plugins/import/test/importVCard_test.py b/gramps/plugins/importer/test/importVCard_test.py similarity index 100% rename from gramps/plugins/import/test/importVCard_test.py rename to gramps/plugins/importer/test/importVCard_test.py diff --git a/po/POTFILES.in b/po/POTFILES.in index 19b26f991..f1b2da9fa 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -550,16 +550,16 @@ gramps/plugins/graph/graphplugins.gpr.py gramps/plugins/graph/gvfamilylines.py gramps/plugins/graph/gvhourglass.py gramps/plugins/graph/gvrelgraph.py -gramps/plugins/import/import.gpr.py -gramps/plugins/import/importcsv.py -gramps/plugins/import/importgedcom.glade -gramps/plugins/import/importgedcom.py -gramps/plugins/import/importgeneweb.py -gramps/plugins/import/importgpkg.py -gramps/plugins/import/importgrdb.py -gramps/plugins/import/importprogen.py -gramps/plugins/import/importvcard.py -gramps/plugins/import/importxml.py +gramps/plugins/importer/import.gpr.py +gramps/plugins/importer/importcsv.py +gramps/plugins/importer/importgedcom.glade +gramps/plugins/importer/importgedcom.py +gramps/plugins/importer/importgeneweb.py +gramps/plugins/importer/importgpkg.py +gramps/plugins/importer/importgrdb.py +gramps/plugins/importer/importprogen.py +gramps/plugins/importer/importvcard.py +gramps/plugins/importer/importxml.py gramps/plugins/lib/holidays.xml.in gramps/plugins/lib/libgedcom.py gramps/plugins/lib/libgrdb.py diff --git a/po/POTFILES.skip b/po/POTFILES.skip index a56a143b6..b93728cb9 100644 --- a/po/POTFILES.skip +++ b/po/POTFILES.skip @@ -464,8 +464,8 @@ gramps/plugins/quickview/__init__.py # # plugins/import directory # -gramps/plugins/import/__init__.py -gramps/plugins/import/test/importVCard_test.py +gramps/plugins/importer/__init__.py +gramps/plugins/importer/test/importVCard_test.py # # plugins/gramplet directory # diff --git a/setup.py b/setup.py index fd1a1c27b..2fcd24ada 100644 --- a/setup.py +++ b/setup.py @@ -399,7 +399,7 @@ setup(name = 'gramps', 'gramps.plugins.export', 'gramps.plugins.gramplet', 'gramps.plugins.graph', - 'gramps.plugins.import', + 'gramps.plugins.importer', 'gramps.plugins.lib', 'gramps.plugins.lib.maps', 'gramps.plugins.mapservices',