Added a make_environment function for evaluating gpr.py envs
svn: r14122
This commit is contained in:
parent
62a2d1672c
commit
6fd1c70dfd
@ -30,7 +30,7 @@ from _pluginreg import (PluginData, PluginRegister, REPORT, TOOL,
|
|||||||
CATEGORY_QR_FAMILY, CATEGORY_QR_EVENT, CATEGORY_QR_SOURCE,
|
CATEGORY_QR_FAMILY, CATEGORY_QR_EVENT, CATEGORY_QR_SOURCE,
|
||||||
CATEGORY_QR_PLACE, CATEGORY_QR_REPOSITORY, CATEGORY_QR_NOTE,
|
CATEGORY_QR_PLACE, CATEGORY_QR_REPOSITORY, CATEGORY_QR_NOTE,
|
||||||
CATEGORY_QR_DATE, PTYPE_STR, CATEGORY_QR_MEDIA,
|
CATEGORY_QR_DATE, PTYPE_STR, CATEGORY_QR_MEDIA,
|
||||||
START, END
|
START, END, make_environment,
|
||||||
)
|
)
|
||||||
from _manager import BasePluginManager
|
from _manager import BasePluginManager
|
||||||
from _import import ImportPlugin
|
from _import import ImportPlugin
|
||||||
@ -49,4 +49,4 @@ __all__ = [ "docbackend", "docgen", "menu", Plugin, PluginData,
|
|||||||
CATEGORY_QR_FAMILY, CATEGORY_QR_EVENT, CATEGORY_QR_SOURCE,
|
CATEGORY_QR_FAMILY, CATEGORY_QR_EVENT, CATEGORY_QR_SOURCE,
|
||||||
CATEGORY_QR_PLACE, CATEGORY_QR_REPOSITORY, CATEGORY_QR_NOTE,
|
CATEGORY_QR_PLACE, CATEGORY_QR_REPOSITORY, CATEGORY_QR_NOTE,
|
||||||
CATEGORY_QR_DATE, PTYPE_STR, CATEGORY_QR_MEDIA,
|
CATEGORY_QR_DATE, PTYPE_STR, CATEGORY_QR_MEDIA,
|
||||||
START, END]
|
START, END, make_environment]
|
||||||
|
@ -33,7 +33,6 @@ import os
|
|||||||
import sys
|
import sys
|
||||||
import re
|
import re
|
||||||
import traceback
|
import traceback
|
||||||
from gen.ggettext import gettext as _
|
|
||||||
|
|
||||||
#-------------------------------------------------------------------------
|
#-------------------------------------------------------------------------
|
||||||
#
|
#
|
||||||
@ -42,6 +41,7 @@ from gen.ggettext import gettext as _
|
|||||||
#-------------------------------------------------------------------------
|
#-------------------------------------------------------------------------
|
||||||
from const import VERSION as GRAMPSVERSION
|
from const import VERSION as GRAMPSVERSION
|
||||||
from TransUtils import get_addon_translator
|
from TransUtils import get_addon_translator
|
||||||
|
from gen.ggettext import gettext as _
|
||||||
|
|
||||||
#-------------------------------------------------------------------------
|
#-------------------------------------------------------------------------
|
||||||
#
|
#
|
||||||
@ -773,6 +773,57 @@ def register(ptype, **kwargs):
|
|||||||
setattr(plg, prop, kwargs[prop])
|
setattr(plg, prop, kwargs[prop])
|
||||||
return plg
|
return plg
|
||||||
|
|
||||||
|
def make_environment(**kwargs):
|
||||||
|
env = {
|
||||||
|
'newplugin': newplugin,
|
||||||
|
'register': register,
|
||||||
|
'STABLE': STABLE,
|
||||||
|
'UNSTABLE': UNSTABLE,
|
||||||
|
'REPORT': REPORT,
|
||||||
|
'QUICKREPORT': QUICKREPORT,
|
||||||
|
'TOOL': TOOL,
|
||||||
|
'IMPORT': IMPORT,
|
||||||
|
'EXPORT': EXPORT,
|
||||||
|
'DOCGEN': DOCGEN,
|
||||||
|
'GENERAL': GENERAL,
|
||||||
|
'MAPSERVICE': MAPSERVICE,
|
||||||
|
'VIEW': VIEW,
|
||||||
|
'RELCALC': RELCALC,
|
||||||
|
'GRAMPLET': GRAMPLET,
|
||||||
|
'CATEGORY_TEXT': CATEGORY_TEXT,
|
||||||
|
'CATEGORY_DRAW': CATEGORY_DRAW,
|
||||||
|
'CATEGORY_CODE': CATEGORY_CODE,
|
||||||
|
'CATEGORY_WEB': CATEGORY_WEB,
|
||||||
|
'CATEGORY_BOOK': CATEGORY_BOOK,
|
||||||
|
'CATEGORY_GRAPHVIZ': CATEGORY_GRAPHVIZ,
|
||||||
|
'TOOL_DEBUG': TOOL_DEBUG,
|
||||||
|
'TOOL_ANAL': TOOL_ANAL,
|
||||||
|
'TOOL_DBPROC': TOOL_DBPROC,
|
||||||
|
'TOOL_DBFIX': TOOL_DBFIX,
|
||||||
|
'TOOL_REVCTL': TOOL_REVCTL,
|
||||||
|
'TOOL_UTILS': TOOL_UTILS,
|
||||||
|
'CATEGORY_QR_MISC': CATEGORY_QR_MISC,
|
||||||
|
'CATEGORY_QR_PERSON': CATEGORY_QR_PERSON,
|
||||||
|
'CATEGORY_QR_FAMILY': CATEGORY_QR_FAMILY,
|
||||||
|
'CATEGORY_QR_EVENT': CATEGORY_QR_EVENT,
|
||||||
|
'CATEGORY_QR_SOURCE': CATEGORY_QR_SOURCE,
|
||||||
|
'CATEGORY_QR_PLACE': CATEGORY_QR_PLACE,
|
||||||
|
'CATEGORY_QR_MEDIA': CATEGORY_QR_MEDIA,
|
||||||
|
'CATEGORY_QR_REPOSITORY': CATEGORY_QR_REPOSITORY,
|
||||||
|
'CATEGORY_QR_NOTE': CATEGORY_QR_NOTE,
|
||||||
|
'CATEGORY_QR_DATE': CATEGORY_QR_DATE,
|
||||||
|
'REPORT_MODE_GUI': REPORT_MODE_GUI,
|
||||||
|
'REPORT_MODE_BKI': REPORT_MODE_BKI,
|
||||||
|
'REPORT_MODE_CLI': REPORT_MODE_CLI,
|
||||||
|
'TOOL_MODE_GUI': TOOL_MODE_GUI,
|
||||||
|
'TOOL_MODE_CLI': TOOL_MODE_CLI,
|
||||||
|
'GRAMPSVERSION': GRAMPSVERSION,
|
||||||
|
'START': START,
|
||||||
|
'END': END,
|
||||||
|
}
|
||||||
|
env.update(kwargs)
|
||||||
|
return env
|
||||||
|
|
||||||
#-------------------------------------------------------------------------
|
#-------------------------------------------------------------------------
|
||||||
#
|
#
|
||||||
# PluginRegister
|
# PluginRegister
|
||||||
@ -830,54 +881,8 @@ class PluginRegister(object):
|
|||||||
local_gettext = get_addon_translator(full_filename).gettext
|
local_gettext = get_addon_translator(full_filename).gettext
|
||||||
try:
|
try:
|
||||||
execfile(full_filename,
|
execfile(full_filename,
|
||||||
{'_': local_gettext,
|
make_environment(_=local_gettext),
|
||||||
'newplugin': newplugin,
|
{})
|
||||||
'register': register,
|
|
||||||
'STABLE': STABLE,
|
|
||||||
'UNSTABLE': UNSTABLE,
|
|
||||||
'REPORT': REPORT,
|
|
||||||
'QUICKREPORT': QUICKREPORT,
|
|
||||||
'TOOL': TOOL,
|
|
||||||
'IMPORT': IMPORT,
|
|
||||||
'EXPORT': EXPORT,
|
|
||||||
'DOCGEN': DOCGEN,
|
|
||||||
'GENERAL': GENERAL,
|
|
||||||
'MAPSERVICE': MAPSERVICE,
|
|
||||||
'VIEW': VIEW,
|
|
||||||
'RELCALC': RELCALC,
|
|
||||||
'GRAMPLET': GRAMPLET,
|
|
||||||
'CATEGORY_TEXT': CATEGORY_TEXT,
|
|
||||||
'CATEGORY_DRAW': CATEGORY_DRAW,
|
|
||||||
'CATEGORY_CODE': CATEGORY_CODE,
|
|
||||||
'CATEGORY_WEB': CATEGORY_WEB,
|
|
||||||
'CATEGORY_BOOK': CATEGORY_BOOK,
|
|
||||||
'CATEGORY_GRAPHVIZ': CATEGORY_GRAPHVIZ,
|
|
||||||
'TOOL_DEBUG': TOOL_DEBUG,
|
|
||||||
'TOOL_ANAL': TOOL_ANAL,
|
|
||||||
'TOOL_DBPROC': TOOL_DBPROC,
|
|
||||||
'TOOL_DBFIX': TOOL_DBFIX,
|
|
||||||
'TOOL_REVCTL': TOOL_REVCTL,
|
|
||||||
'TOOL_UTILS': TOOL_UTILS,
|
|
||||||
'CATEGORY_QR_MISC': CATEGORY_QR_MISC,
|
|
||||||
'CATEGORY_QR_PERSON': CATEGORY_QR_PERSON,
|
|
||||||
'CATEGORY_QR_FAMILY': CATEGORY_QR_FAMILY,
|
|
||||||
'CATEGORY_QR_EVENT': CATEGORY_QR_EVENT,
|
|
||||||
'CATEGORY_QR_SOURCE': CATEGORY_QR_SOURCE,
|
|
||||||
'CATEGORY_QR_PLACE': CATEGORY_QR_PLACE,
|
|
||||||
'CATEGORY_QR_MEDIA': CATEGORY_QR_MEDIA,
|
|
||||||
'CATEGORY_QR_REPOSITORY': CATEGORY_QR_REPOSITORY,
|
|
||||||
'CATEGORY_QR_NOTE': CATEGORY_QR_NOTE,
|
|
||||||
'CATEGORY_QR_DATE': CATEGORY_QR_DATE,
|
|
||||||
'REPORT_MODE_GUI': REPORT_MODE_GUI,
|
|
||||||
'REPORT_MODE_BKI': REPORT_MODE_BKI,
|
|
||||||
'REPORT_MODE_CLI': REPORT_MODE_CLI,
|
|
||||||
'TOOL_MODE_GUI': TOOL_MODE_GUI,
|
|
||||||
'TOOL_MODE_CLI': TOOL_MODE_CLI,
|
|
||||||
'GRAMPSVERSION': GRAMPSVERSION,
|
|
||||||
'START': START,
|
|
||||||
'END': END,
|
|
||||||
},
|
|
||||||
{})
|
|
||||||
except ValueError, msg:
|
except ValueError, msg:
|
||||||
print _('Failed reading plugin registration %(filename)s') % \
|
print _('Failed reading plugin registration %(filename)s') % \
|
||||||
{'filename' : filename}
|
{'filename' : filename}
|
||||||
|
Loading…
Reference in New Issue
Block a user