Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GEPS 026: Replace 'make' for Gramps build

Browse Source 
a/Part 1: import from gen piece works partially
b/Gramps as a stub to start gramps application


svn: r20465
This commit is contained in:
Benny Malengier 2012-09-30 10:30:08 +00:00
parent 7c77224d1a
commit e9253804be
390 changed files with 1303 additions and 1094 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
Gramps Normal file
View File

@ -0,0 +1,39 @@
#
# Gramps - a GTK+/GNOME based genealogy program
#
# Copyright (C) 2012 Benny Malengier
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
# $Id: grampsapp.py -1 $
"""
This is a stub to start Gramps. It is provided for the sole reason of being
able to run gramps from the source directory without setting PYTHONPATH
From this position, import gramps works great
"""
# here import gramps works. As __temporary__ workaround, we also put the gramps
# folder itself on the systempath
import sys, os
pathgramps = os.path.dirname(os.path.abspath(__file__))
pathgramps += os.sep + 'gramps'
sys.path.append(pathgramps)
#now start gramps
import gramps.grampsapp as app
app.main()

2
gramps.sh.in
View File

@ -25,4 +25,4 @@ PACKAGE=@PACKAGE@
export GRAMPSDIR=@datadir@/@PACKAGE@
exec @PYTHON@ -O $GRAMPSDIR/gramps.py "$@"
exec @PYTHON@ -O $GRAMPSDIR/grampsapp.py "$@"

217
setup.py
View File

@ -4,7 +4,8 @@
# Gramps - a GTK+/GNOME based genealogy program
#
# Copyright (C) 2012 Nick Hall
# Copyright (C) 2012 Rob G. Healey <robhealey1@gmail.com>
# Copyright (C) 2012 Rob G. Healey
# Copyright (C) 2012 Benny Malengier
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -25,13 +26,20 @@
'''
Gramps distutils module.
'''
#check python version first
import sys
major, minor1, minor2, s, tmp = sys.version_info
if (major==2 and minor1<7) or major<2 or major>3:
raise SystemExit("""Gramps requires Python 2.7 or later, Python 3 not supported.""")
from distutils import log
from distutils.core import setup
from distutils.util import convert_path, newer
from distutils.command.build import build as _build
from distutils.command.install import install as _install
import os
import sys
import glob
import codecs
import commands
@ -86,7 +94,8 @@ def build_trans(build_cmd):
msg = 'ERROR: Building language translation files failed.'
raise SystemExit(msg)
target = 'share/locale/' + lang + '/LC_MESSAGES'
#linux specific piece:
target = os.path.join(['share', 'locale', lang, 'LC_MESSAGES'])
data_files.append((target, [mo_file]))
log.info('Compiling %s >> %s.', po_file, target)
@ -96,7 +105,7 @@ def build_man(build_cmd):
Compresses Gramps manual files
'''
data_files = build_cmd.distribution.data_files
build_data = build_cmd.build_base + '/data/'
build_data = build_cmd.build_base + os.sep + 'data' + os.sep
for man_dir, dirs, files in os.walk(os.path.join('data', 'man')):
if 'gramps.1.in' in files:
filename = os.path.join(man_dir, 'gramps.1.in')
@ -128,8 +137,8 @@ def build_man(build_cmd):
filename = False
lang = man_dir[8:]
src = build_data + 'man' + lang + '/gramps.1.gz'
target = 'share/man/' + lang + '/man1'
src = build_data + 'man' + lang + os.sep + 'gramps.1.gz'
target = os.path.join('share', 'man', lang, 'man1')
data_files.append((target, [src]))
log.info('Compiling %s >> %s.', src, target)
@ -143,14 +152,14 @@ def build_intl(build_cmd):
data_files = build_cmd.distribution.data_files
base = build_cmd.build_base
merge_files = (('data/gramps.desktop',
'share/applications',
merge_files = (('data' + os.sep + 'gramps.desktop',
'share' + os.sep + 'applications',
'-d'),
('data/gramps.keys',
'share/mime-info',
('data' + os.sep + 'gramps.keys',
'share' + os.sep + 'mime-info',
'-k'),
('data/gramps.xml',
'share/mime/packages',
('data' + os.sep + 'gramps.xml',
'share' + os.sep + 'mime' + os.sep + 'packages',
'-x'))
for filename, target, option in merge_files:
@ -160,11 +169,12 @@ def build_intl(build_cmd):
if not(os.path.isdir(newdir) or os.path.islink(newdir)):
os.makedirs(newdir)
merge(filename + '.in', newfile, option)
data_files.append((target, [base + '/' + filename]))
data_files.append((target, [base + os.sep + filename]))
for filename in INTLTOOL_FILES:
filename = convert_path(filename)
merge(filename + '.in', filename, '-x', po_dir='/tmp', cache=False)
merge(filename + '.in', filename, '-x', po_dir=os.sep + 'tmp',
cache=False)
def merge(in_file, out_file, option, po_dir='po', cache=True):
'''
@ -196,7 +206,7 @@ def install_template(install_cmd):
os.makedirs(build_scripts)
data_files = install_cmd.distribution.data_files
write_gramps_script(install_cmd, build_scripts)
data_files.append(('bin', [build_scripts + '/gramps']))
data_files.append(('bin', [build_scripts + os.sep + 'gramps']))
write_const_py(install_cmd)
def write_gramps_script(install_cmd, build_scripts):
@ -222,12 +232,18 @@ def write_const_py(install_cmd):
'''
const_py_in = os.path.join('src', 'gen', 'const.py.in')
const_py = os.path.join('src', 'gen', 'const.py')
prefix = install_cmd.install_data
sysconfdir = os.path.join(prefix, 'etc') # Is this correct?
if hasattr(install_cmd, 'install_data'):
#during install
prefix = "'%s'" % install_cmd.install_data
sysconfdir = "'%s'" % os.path.join(install_cmd.install_data, 'etc') # Is this correct?
else:
#in build
prefix = 'os.path.join(os.path.dirname(__file__), os.pardir)'
sysconfdir = prefix + ' + "' + os.sep + 'etc"' # Is this correct?
subst_vars = ((u'@VERSIONSTRING@', VERSION),
(u'@prefix@', prefix),
(u'@sysconfdir@', sysconfdir))
(u'"@prefix@"', prefix),
(u'"@sysconfdir@"', sysconfdir))
substitute_variables(const_py_in, const_py, subst_vars)
@ -256,6 +272,7 @@ class build(_build):
build_trans(self)
build_man(self)
build_intl(self)
write_const_py(self)
_build.run(self)
class install(_install):
@ -284,11 +301,84 @@ GRAMPS_FILES = glob.glob(os.path.join('example', 'gramps', '*.*'))
PNG_FILES = glob.glob(os.path.join('data', '*.png'))
SVG_FILES = glob.glob(os.path.join('data', '*.svg'))
data_list = [
os.path.join('data', '*.txt'),
os.path.join('data', '*.xml'),
os.path.join('gui', 'glade', '*.glade'),
os.path.join('images','*.ico'),
os.path.join('images', '*.png'),
os.path.join('images', 'splash.jpg'),
os.path.join('images', '*.svg'),
os.path.join('images', '16x16', '*.png'),
os.path.join('images', '22x22', '*.png'),
os.path.join('images', '48x48', '*.png'),
os.path.join('images', 'scalable', '*.svg')
]
# add all subdirs of plugin with glade:
basedir = os.path.join('src', 'plugins')
for (dirpath, dirnames, filenames) in os.walk(basedir):
root, subdir = os.path.split(dirpath)
if subdir.startswith("."):
dirnames[:] = []
continue
for dirname in dirnames:
# Skip hidden and system directories:
if dirname.startswith("."):
dirnames.remove(dirname)
#we add to data_list so glade , xml, files are found, we don't need the src/ part
data_list.append(os.path.join(dirpath[4:], '*.glade'))
data_list.append(os.path.join(dirpath[4:], '*.xml'))
data_list.append(os.path.join(dirpath[4:], '*.png'))
data_list.append(os.path.join(dirpath[4:], '*.svg'))
data_list.append(os.path.join(dirpath[4:], '*.css'))
data_list.append(os.path.join(dirpath[4:], '*.html'))
data_list.append(os.path.join(dirpath[4:], '*.js'))
data_list.append(os.path.join('plugins', 'webstuff', 'images', '*.gif'))
data_list.append(os.path.join('plugins', 'webstuff', 'images', '*.ico'))
# 'plugins' + os.sep + '*.glade',
# 'plugins' + os.sep + '*.py',
# 'plugins' + os.sep + 'docgen' + os.sep + '*.glade',
# 'plugins' + os.sep + 'docgen' + os.sep + '*.py',
# 'plugins' + os.sep + 'drawreport' + os.sep + '*.py',
# 'plugins' + os.sep + 'export' + os.sep + '*.glade',
# 'plugins' + os.sep + 'export' + os.sep + '*.py',
# 'plugins' + os.sep + 'gramplet' + os.sep + '*.py',
# 'plugins' + os.sep + 'graph' + os.sep + '*.py',
# 'plugins' + os.sep + 'import' + os.sep + '*.glade',
# 'plugins' + os.sep + 'import' + os.sep + '*.py',
# 'plugins' + os.sep + 'lib' + os.sep + '*.py',
# 'plugins' + os.sep + 'lib' + os.sep + '*.xml',
# 'plugins' + os.sep + 'lib' + os.sep + 'maps' + os.sep + '*.py',
# 'plugins' + os.sep + 'mapservices' + os.sep + '*.py',
# 'plugins' + os.sep + 'quickview' + os.sep + '*.py',
# 'plugins' + os.sep + 'rel' + os.sep + '*.py',
# 'plugins' + os.sep + 'sidebar' + os.sep + '*.py',
# 'plugins' + os.sep + 'textreport' + os.sep + '*.py',
# 'plugins' + os.sep + 'tool' + os.sep + '*.glade',
# 'plugins' + os.sep + 'tool' + os.sep + '*.py',
# 'plugins' + os.sep + 'view' + os.sep + '*.py',
# 'plugins' + os.sep + 'webreport' + os.sep + '*.py',
# 'plugins' + os.sep + 'webstuff' + os.sep + '*.html',
# 'plugins' + os.sep + 'webstuff' + os.sep + '*.py',
# 'plugins' + os.sep + 'webstuff' + os.sep + 'css'
# + os.sep + '*.css',
# 'plugins' + os.sep + 'webstuff' + os.sep + 'css'
# + os.sep + 'swanky-purse' + os.sep + '*.css',
# 'plugins' + os.sep + 'webstuff' + os.sep + 'css'
# + os.sep + 'swanky-purse' + os.sep + 'images' + os.sep + '*.png',
# 'plugins' + os.sep + 'webstuff' + os.sep + 'images'
# + os.sep + '*.png',
# 'plugins' + os.sep + 'webstuff' + os.sep + 'images'
# + os.sep + '*.svg',
# 'plugins' + os.sep + 'webstuff' + os.sep + 'javascript'
# + os.sep + '*.js']
setup(name = 'gramps',
description = ('Gramps (Genealogical Research and Analysis Management '
'Programming System)'),
long_description = ('Gramps (Genealogical Research and Analysis '
'Management Programming System) is a GNOME based '
'Management Programming System) is a full featured '
'genealogy program supporting a Python based plugin '
'system.'),
version = VERSION,
@ -331,6 +421,7 @@ setup(name = 'gramps',
'gramps.gen.proxy',
'gramps.gen.simple',
'gramps.gen.utils',
'gramps.gen.utils.docgen',
'gramps.gui',
'gramps.gui.editors',
'gramps.gui.editors.displaytabs',
@ -346,56 +437,38 @@ setup(name = 'gramps',
'gramps.gui.views',
'gramps.gui.views.treemodels',
'gramps.gui.widgets',
'gramps.test'],
package_data={'gramps': ['data/*.txt',
'data/*.xml',
'gui/glade/*.glade',
'images/*.ico',
'images/*.png',
'images/splash.jpg',
'images/*.svg',
'images/16x16/*.png',
'images/22x22/*.png',
'images/48x48/*.png',
'images/scalable/*.svg',
'plugins/*.glade',
'plugins/*.py',
'plugins/docgen/*.glade',
'plugins/docgen/*.py',
'plugins/drawreport/*.py',
'plugins/export/*.glade',
'plugins/export/*.py',
'plugins/gramplet/*.py',
'plugins/graph/*.py',
'plugins/import/*.glade',
'plugins/import/*.py',
'plugins/lib/*.py',
'plugins/lib/*.xml',
'plugins/lib/maps/*.py',
'plugins/mapservices/*.py',
'plugins/quickview/*.py',
'plugins/rel/*.py',
'plugins/sidebar/*.py',
'plugins/textreport/*.py',
'plugins/tool/*.glade',
'plugins/tool/*.py',
'plugins/view/*.py',
'plugins/webreport/*.py',
'plugins/webstuff/*.html',
'plugins/webstuff/*.py',
'plugins/webstuff/css/*.css',
'plugins/webstuff/css/swanky-purse/*.css',
'plugins/webstuff/css/swanky-purse/images/*.png',
'plugins/webstuff/images/*.gif',
'plugins/webstuff/images/*.ico',
'plugins/webstuff/images/*.png',
'plugins/webstuff/images/*.svg',
'plugins/webstuff/javascript/*.js']},
data_files=[('share/mime-info', ['data/gramps.mime']),
('share/icons/gnome/48x48/mimetypes', PNG_FILES),
('share/icons/gnome/scalable/mimetypes', SVG_FILES),
('share/icons', ['src/images/gramps.png']),
('share/doc/gramps/example/gedcom', GEDCOM_FILES),
('share/doc/gramps/example/gramps', GRAMPS_FILES),
('share/doc/gramps', DOC_FILES)]
'gramps.test',
'gramps.plugins',
'gramps.plugins.docgen',
'gramps.plugins.drawreport',
'gramps.plugins.export',
'gramps.plugins.gramplet',
'gramps.plugins.graph',
'gramps.plugins.import',
'gramps.plugins.lib',
'gramps.plugins.lib.maps',
'gramps.plugins.mapservices',
'gramps.plugins.quickview',
'gramps.plugins.rel',
'gramps.plugins.sidebar',
'gramps.plugins.textreport',
'gramps.plugins.tool',
'gramps.plugins.view',
'gramps.plugins.webreport',
'gramps.plugins.webstuff',
],
package_data={'gramps': data_list},
data_files=[('share' + os.sep + 'mime-info',
['data' + os.sep + 'gramps.mime']),
('share' + os.sep + 'icons' + os.sep + 'gnome' + os.sep
+ '48x48' + os.sep + 'mimetypes', PNG_FILES),
('share' + os.sep + 'icons' + os.sep + 'gnome' + os.sep
+ 'scalable' + os.sep + 'mimetypes', SVG_FILES),
('share' + os.sep + 'icons', ['src' + os.sep + 'images'
+ os.sep + 'gramps.png']),
('share' + os.sep + 'doc' + os.sep + 'gramps' + os.sep
+ 'example' + os.sep + 'gedcom', GEDCOM_FILES),
('share' + os.sep + 'doc' + os.sep + 'gramps' + os.sep
+ 'example' + os.sep + 'gramps', GRAMPS_FILES),
('share' + os.sep + 'doc' + os.sep + 'gramps', DOC_FILES)]
)

30
src/__init__.py
View File

@ -0,0 +1,30 @@
#
# Gramps - a GTK+/GNOME based genealogy program
#
# Copyright (C) 2000-2007 Donald N. Allingham
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
# gen/__init__.py
# $Id: __init__.py 19732 2012-05-31 23:46:57Z nick-h $
#
"""
The core gramps module provides the different packages
Plugins are loaded dynamically, so they the plugin directory is not included
"""
__all__ = ["gen", "cli", "gui"]

6
src/gen/config.py
View File

@ -34,7 +34,6 @@ This package implements access to GRAMPS configuration.
#
#---------------------------------------------------------------
import os, sys
from gen.ggettext import gettext as _
import logging
#---------------------------------------------------------------
@ -42,8 +41,9 @@ import logging
# Gramps imports
#
#---------------------------------------------------------------
from gen.const import HOME_DIR, USER_HOME, VERSION_DIR
from gen.utils.configmanager import ConfigManager
from ggettext import gettext as _
from const import HOME_DIR, USER_HOME, VERSION_DIR
from utils.configmanager import ConfigManager
#---------------------------------------------------------------
#

8
src/gen/const.py.in
View File

@ -34,7 +34,13 @@ Provides constants for other modules
import os
import sys
import uuid
from gen.ggettext import sgettext as _
#-------------------------------------------------------------------------
#
# Gramps modules
#
#-------------------------------------------------------------------------
from ggettext import sgettext as _
#-------------------------------------------------------------------------
#

2
src/gen/constfunc.py
View File

@ -40,7 +40,7 @@ import sys
# Gramps modules
#
#-------------------------------------------------------------------------
from gen.const import WINDOWS, MACOS, LINUX
from const import WINDOWS, MACOS, LINUX
#-------------------------------------------------------------------------
#

2
src/gen/datehandler/_date_bg.py
View File

@ -37,7 +37,7 @@ import re
# GRAMPS modules
#
#-------------------------------------------------------------------------
from gen.lib import Date
from ..lib.date import Date
from _dateparser import DateParser
from _datedisplay import DateDisplay
from _datehandler import register_datehandler

2
src/gen/datehandler/_date_ca.py
View File

@ -39,7 +39,7 @@ import re
# GRAMPS modules
#
#-------------------------------------------------------------------------
from gen.lib import Date
from ..lib.date import Date
from _dateparser import DateParser
from _datedisplay import DateDisplay
from _datehandler import register_datehandler

2
src/gen/datehandler/_date_cs.py
View File

@ -37,7 +37,7 @@ import re
# GRAMPS modules
#
#-------------------------------------------------------------------------
from gen.lib import Date
from ..lib.date import Date
from _dateparser import DateParser
from _datedisplay import DateDisplay
from _datehandler import register_datehandler

2
src/gen/datehandler/_date_da.py
View File

@ -37,7 +37,7 @@ import re
# GRAMPS modules
#
#-------------------------------------------------------------------------
from gen.lib import Date
from ..lib.date import Date
from _dateparser import DateParser
from _datedisplay import DateDisplay
from _datehandler import register_datehandler

2
src/gen/datehandler/_date_de.py
View File

@ -37,7 +37,7 @@ import re
# GRAMPS modules
#
#-------------------------------------------------------------------------
from gen.lib import Date
from ..lib.date import Date
from _dateparser import DateParser
from _datedisplay import DateDisplay
from _datehandler import register_datehandler

2
src/gen/datehandler/_date_es.py
View File

@ -37,7 +37,7 @@ import re
# GRAMPS modules
#
#-------------------------------------------------------------------------
from gen.lib import Date
from ..lib.date import Date
from _dateparser import DateParser
from _datedisplay import DateDisplay
from _datehandler import register_datehandler

2
src/gen/datehandler/_date_fi.py
View File

@ -37,7 +37,7 @@ import re
# GRAMPS modules
#
#-------------------------------------------------------------------------
from gen.lib import Date
from ..lib.date import Date
from _dateparser import DateParser
from _datedisplay import DateDisplay
from _datehandler import register_datehandler

2
src/gen/datehandler/_date_fr.py
View File

@ -41,7 +41,7 @@ import re
#
#-------------------------------------------------------------------------
from gen.lib import Date
from ..lib.date import Date
from _dateparser import DateParser
from _datedisplay import DateDisplay
from _datehandler import register_datehandler

2
src/gen/datehandler/_date_hr.py
View File

@ -39,7 +39,7 @@ import re
# GRAMPS modules
#
#-------------------------------------------------------------------------
from gen.lib import Date
from ..lib.date import Date
from _dateparser import DateParser
from _datedisplay import DateDisplay
from _datehandler import register_datehandler

2
src/gen/datehandler/_date_it.py
View File

@ -39,7 +39,7 @@ import re
# GRAMPS modules
#
#-------------------------------------------------------------------------
from gen.lib import Date
from ..lib.date import Date
from _dateparser import DateParser
from _datedisplay import DateDisplay
from _datehandler import register_datehandler

2
src/gen/datehandler/_date_lt.py
View File

@ -37,7 +37,7 @@ import re
# GRAMPS modules
#
#-------------------------------------------------------------------------
from gen.lib import Date
from ..lib.date import Date
from _dateparser import DateParser
from _datedisplay import DateDisplay
from _datehandler import register_datehandler

2
src/gen/datehandler/_date_nb.py
View File

@ -37,7 +37,7 @@ import re
# GRAMPS modules
#
#-------------------------------------------------------------------------
from gen.lib import Date
from ..lib.date import Date
from _dateparser import DateParser
from _datedisplay import DateDisplay
from _datehandler import register_datehandler

2
src/gen/datehandler/_date_nl.py
View File

@ -43,7 +43,7 @@ import re
# GRAMPS modules
#
#-------------------------------------------------------------------------
from gen.lib import Date
from ..lib.date import Date
from _dateparser import DateParser
from _datedisplay import DateDisplay
from _datehandler import register_datehandler

2
src/gen/datehandler/_date_pl.py
View File

@ -40,7 +40,7 @@ import re
# GRAMPS modules
#
#-------------------------------------------------------------------------
from gen.lib import Date
from ..lib.date import Date
from _dateparser import DateParser
from _datedisplay import DateDisplay
from _datehandler import register_datehandler

2
src/gen/datehandler/_date_pt.py
View File

@ -39,7 +39,7 @@ import re
# GRAMPS modules
#
#-------------------------------------------------------------------------
from gen.lib import Date
from ..lib.date import Date
from _dateparser import DateParser
from _datedisplay import DateDisplay
from _datehandler import register_datehandler

2
src/gen/datehandler/_date_ru.py
View File

@ -37,7 +37,7 @@ import re
# GRAMPS modules
#
#-------------------------------------------------------------------------
from gen.lib import Date
from ..lib.date import Date
from _dateparser import DateParser
from _datedisplay import DateDisplay
from _datehandler import register_datehandler

2
src/gen/datehandler/_date_sk.py
View File

@ -37,7 +37,7 @@ import re
# GRAMPS modules
#
#-------------------------------------------------------------------------
from gen.lib import Date
from ..lib.date import Date
from _dateparser import DateParser
from _datedisplay import DateDisplay
from _datehandler import register_datehandler

2
src/gen/datehandler/_date_sl.py
View File

@ -39,7 +39,7 @@ import re
# GRAMPS modules
#
#-------------------------------------------------------------------------
from gen.lib import Date
from ..lib.date import Date
from _dateparser import DateParser
from _datedisplay import DateDisplay
from _datehandler import register_datehandler

2
src/gen/datehandler/_date_sr.py
View File

@ -40,7 +40,7 @@ import re
# GRAMPS modules
#
#-------------------------------------------------------------------------
from gen.lib import Date
from ..lib.date import Date
from _dateparser import DateParser
from _datedisplay import DateDisplay
from _datehandler import register_datehandler

2
src/gen/datehandler/_date_sv.py
View File

@ -37,7 +37,7 @@ import re
# GRAMPS modules
#
#-------------------------------------------------------------------------
from gen.lib import Date
from ..lib.date import Date
from _dateparser import DateParser
from _datedisplay import DateDisplay
from _datehandler import register_datehandler

2
src/gen/datehandler/_date_zh.py
View File

@ -39,7 +39,7 @@ import re
#
#-------------------------------------------------------------------------
from gen.lib import Date
from ..lib.date import Date
from _dateparser import DateParser
from _datedisplay import DateDisplay
from _datehandler import register_datehandler

2
src/gen/datehandler/_datedisplay.py
View File

@ -38,7 +38,7 @@ log = logging.getLogger(".DateDisplay")
# GRAMPS modules
#
#-------------------------------------------------------------------------
from gen.lib import Date
from ..lib.date import Date
import _grampslocale
#-------------------------------------------------------------------------

2
src/gen/datehandler/_datehandler.py
View File

@ -47,7 +47,7 @@ log = logging.getLogger(".gen.datehandler")
#-------------------------------------------------------------------------
from _dateparser import DateParser
from _datedisplay import DateDisplay, DateDisplayEn
from gen.constfunc import win
from ..constfunc import win
#-------------------------------------------------------------------------
#

2
src/gen/datehandler/_dateparser.py
View File

@ -48,7 +48,7 @@ log = logging.getLogger(".DateParser")
# GRAMPS modules
#
#-------------------------------------------------------------------------
from gen.lib import Date, DateError
from ..lib.date import Date, DateError
import _grampslocale
#-------------------------------------------------------------------------

4
src/gen/datehandler/_dateutils.py
View File

@ -30,14 +30,14 @@ Class handling language-specific selection for date parser and displayer.
#
#-------------------------------------------------------------------------
import time
from gen.lib import Date
from ..lib.date import Date
#-------------------------------------------------------------------------
#
# GRAMPS modules
#
#-------------------------------------------------------------------------
from gen.datehandler import LANG_TO_DISPLAY, LANG, parser, displayer
from . import LANG_TO_DISPLAY, LANG, parser, displayer
#--------------------------------------------------------------
#

2
src/gen/datehandler/_grampslocale.py
View File

@ -22,7 +22,7 @@
# $Id$
import locale
from gen.constfunc import mac, win
from ..constfunc import mac, win
"""
Some OS environments do not support the locale.nl_langinfo() method

4
src/gen/db/backup.py
View File

@ -62,8 +62,8 @@ import cPickle as pickle
# Gramps libs
#
#------------------------------------------------------------------------
from gen.db.exceptions import DbException
from gen.db.write import FAMILY_TBL, PLACES_TBL, SOURCES_TBL, MEDIA_TBL, \
from exceptions import DbException
from write import FAMILY_TBL, PLACES_TBL, SOURCES_TBL, MEDIA_TBL, \
EVENTS_TBL, PERSON_TBL, REPO_TBL, NOTE_TBL, TAG_TBL, META, CITATIONS_TBL
#------------------------------------------------------------------------

11
src/gen/db/base.py
View File

@ -32,14 +32,15 @@ from this class.
# Python libraries
#
#-------------------------------------------------------------------------
from gen.ggettext import gettext as _
from ..ggettext import gettext as _
#-------------------------------------------------------------------------
#
# GRAMPS libraries
#
#-------------------------------------------------------------------------
import gen.lib
from ..lib.childreftype import ChildRefType
from ..lib.childref import ChildRef
from txn import DbTxn
from exceptions import DbTransactionCancel
@ -1596,13 +1597,13 @@ class DbWriteBase(DbReadBase):
raise NotImplementedError
def add_child_to_family(self, family, child,
mrel=gen.lib.ChildRefType(),
frel=gen.lib.ChildRefType(),
mrel=ChildRefType(),
frel=ChildRefType(),
trans=None):
"""
Adds a child to a family.
"""
cref = gen.lib.ChildRef()
cref = ChildRef()
cref.ref = child.handle
cref.set_father_relation(frel)
cref.set_mother_relation(mrel)

2
src/gen/db/cursor.py
View File

@ -28,7 +28,7 @@
#-------------------------------------------------------------------------
from cPickle import dumps, loads
from gen.config import config
from ..config import config
if config.get('preferences.use-bsddb3'):
from bsddb3 import db
else:

2
src/gen/db/dbconst.py
View File

@ -66,7 +66,7 @@ DBLOCKS = 100000 # Maximum number of locks supported
DBOBJECTS = 100000 # Maximum number of simultaneously locked objects
DBUNDO = 1000 # Maximum size of undo buffer
from gen.config import config
from ..config import config
if config.get('preferences.use-bsddb3'):
from bsddb3.db import DB_CREATE, DB_AUTO_COMMIT, DB_DUP, DB_DUPSORT, DB_RDONLY
else:

18
src/gen/db/dictionary.py
View File

@ -31,8 +31,8 @@ import base64
import time
import gen
import re
from gen.db import DbReadBase, DbWriteBase, DbTxn
from gen.db import (PERSON_KEY,
from . import DbReadBase, DbWriteBase, DbTxn
from . import (PERSON_KEY,
FAMILY_KEY,
CITATION_KEY,
SOURCE_KEY,
@ -41,9 +41,17 @@ from gen.db import (PERSON_KEY,
PLACE_KEY,
REPOSITORY_KEY,
NOTE_KEY)
from gen.utils.id import create_id
from gen.lib import (MediaObject, Person, Family, Source, Citation, Event,
Place, Repository, Note, Tag)
from ..utils.id import create_id
from ..lib.mediaobj import MediaObject
from ..lib.person import Person
from ..lib.family import Family
from ..lib.src import Source
from ..lib.citation import Citation
from ..lib.event import Event
from ..lib.place import Place
from ..lib.repo import Repository
from ..lib.note import Note
from ..lib.tag import Tag
class Cursor(object):
"""

2
src/gen/db/exceptions.py
View File

@ -27,7 +27,7 @@
# Standard python modules
#
#-------------------------------------------------------------------------
from gen.ggettext import gettext as _
from ..ggettext import gettext as _
class DbException(Exception):

35
src/gen/db/read.py
View File

@ -38,12 +38,12 @@ import locale
import os
from sys import maxint
from gen.config import config
from ..config import config
if config.get('preferences.use-bsddb3'):
from bsddb3 import db
else:
from bsddb import db
from gen.ggettext import gettext as _
from ..ggettext import gettext as _
import re
import logging
@ -53,15 +53,26 @@ import logging
# GRAMPS libraries
#
#-------------------------------------------------------------------------
from gen.lib import (MediaObject, Person, Family, Source, Citation, Event,
Place, Repository, Note, Tag, GenderStats, Researcher,
NameOriginType)
from gen.db.dbconst import *
from gen.utils.callback import Callback
from gen.utils.cast import conv_dbstr_to_unicode
from gen.db import (BsddbBaseCursor, DbReadBase)
from gen.utils.id import create_id
from gen.errors import DbError
from ..lib.mediaobj import MediaObject
from ..lib.person import Person
from ..lib.family import Family
from ..lib.src import Source
from ..lib.citation import Citation
from ..lib.event import Event
from ..lib.place import Place
from ..lib.repo import Repository
from ..lib.note import Note
from ..lib.tag import Tag
from ..lib.genderstats import GenderStats
from ..lib.researcher import Researcher
from ..lib.nameorigintype import NameOriginType
from dbconst import *
from ..utils.callback import Callback
from ..utils.cast import conv_dbstr_to_unicode
from . import (BsddbBaseCursor, DbReadBase)
from ..utils.id import create_id
from ..errors import DbError
LOG = logging.getLogger(DBLOGNAME)
LOG = logging.getLogger(".citation")
@ -70,7 +81,7 @@ LOG = logging.getLogger(".citation")
# constants
#
#-------------------------------------------------------------------------
from gen.db.dbconst import *
from dbconst import *
_SIGBASE = ('person', 'family', 'source', 'citation',
'event', 'media', 'place', 'repository',

2
src/gen/db/txn.py
View File

@ -41,7 +41,7 @@ from collections import defaultdict
# Gramps modules
#
#-------------------------------------------------------------------------
from gen.db.dbconst import (DBLOGNAME, TXNADD, TXNUPD, TXNDEL)
from dbconst import (DBLOGNAME, TXNADD, TXNUPD, TXNDEL)
_LOG = logging.getLogger(DBLOGNAME)

10
src/gen/db/undoredo.py
View File

@ -36,21 +36,21 @@ import time, os
import cPickle as pickle
from collections import deque
from gen.config import config
from ..config import config
if config.get('preferences.use-bsddb3'):
from bsddb3 import db
else:
from bsddb import db
from gen.ggettext import gettext as _
from ..ggettext import gettext as _
#-------------------------------------------------------------------------
#
# Gramps modules
#
#-------------------------------------------------------------------------
from gen.db.dbconst import *
from gen.db import BSDDBTxn
from gen.errors import DbError
from dbconst import *
from . import BSDDBTxn
from ..errors import DbError
#-------------------------------------------------------------------------
#

16
src/gen/db/upgrade.py
View File

@ -23,8 +23,8 @@
from __future__ import with_statement
from gen.lib.markertype import MarkerType
from gen.lib.tag import Tag
from ..lib.markertype import MarkerType
from ..lib.tag import Tag
import time
import logging
LOG = logging.getLogger(".citation")
@ -34,17 +34,17 @@ from gen.ggettext import gettext as _
"""
methods to upgrade a database from version 13 to current version
"""
from gen.config import config
from ..config import config
if config.get('preferences.use-bsddb3'):
from bsddb3 import db
else:
from bsddb import db
from gen.db import BSDDBTxn
from gen.lib.nameorigintype import NameOriginType
from gen.db.write import _mkname, SURNAMES
from gen.db.dbconst import (PERSON_KEY, FAMILY_KEY, EVENT_KEY,
from . import BSDDBTxn
from ..lib.nameorigintype import NameOriginType
from write import _mkname, SURNAMES
from dbconst import (PERSON_KEY, FAMILY_KEY, EVENT_KEY,
MEDIA_KEY, PLACE_KEY, REPOSITORY_KEY)
from gui.dialog import (InfoDialog)
from gramps.gui.dialog import (InfoDialog)
def gramps_upgrade_16(self):
"""Upgrade database from version 15 to 16. This upgrade converts all

33
src/gen/db/write.py
View File

@ -42,8 +42,8 @@ from functools import wraps
import logging
from sys import maxint
from gen.ggettext import gettext as _
from gen.config import config
from ..ggettext import gettext as _
from ..config import config
if config.get('preferences.use-bsddb3'):
from bsddb3 import dbshelve, db
else:
@ -54,18 +54,29 @@ else:
# Gramps modules
#
#-------------------------------------------------------------------------
from gen.lib import (GenderStats, Person, Family, Event, Place, Source,
Citation, MediaObject, Repository, Note, Tag)
from gen.db import (DbBsddbRead, DbWriteBase, BSDDBTxn,
from ..lib.person import Person
from ..lib.family import Family
from ..lib.src import Source
from ..lib.citation import Citation
from ..lib.event import Event
from ..lib.place import Place
from ..lib.repo import Repository
from ..lib.mediaobj import MediaObject
from ..lib.note import Note
from ..lib.tag import Tag
from ..lib.genderstats import GenderStats
from ..lib.researcher import Researcher
from . import (DbBsddbRead, DbWriteBase, BSDDBTxn,
DbTxn, BsddbBaseCursor, BsddbDowngradeError, DbVersionError,
DbEnvironmentError, DbUpgradeRequiredError, find_surname,
find_surname_name, DbUndoBSDDB as DbUndo)
from gen.db.dbconst import *
from gen.utils.callback import Callback
from gen.utils.cast import (conv_unicode_tosrtkey, conv_dbstr_to_unicode)
from gen.updatecallback import UpdateCallback
from gen.errors import DbError
from gen.constfunc import win
from dbconst import *
from ..utils.callback import Callback
from ..utils.cast import (conv_unicode_tosrtkey, conv_dbstr_to_unicode)
from ..updatecallback import UpdateCallback
from ..errors import DbError
from ..constfunc import win
_LOG = logging.getLogger(DBLOGNAME)
LOG = logging.getLogger(".citation")

7
src/gen/display/name.py
View File

@ -53,7 +53,7 @@ Specific symbols for parts of a name are defined:
# Python modules
#
#-------------------------------------------------------------------------
from gen.ggettext import sgettext as _
from ..ggettext import sgettext as _
import re
#-------------------------------------------------------------------------
@ -61,10 +61,11 @@ import re
# GRAMPS modules
#
#-------------------------------------------------------------------------
from gen.lib import Name, NameOriginType
from ..lib.name import Name
from ..lib.nameorigintype import NameOriginType
try:
from gen.config import config
from ..config import config
WITH_GRAMPS_CONFIG=True
except ImportError:
WITH_GRAMPS_CONFIG=False

2
src/gen/filters/__init__.py
View File

@ -27,7 +27,7 @@ Package providing filtering framework for GRAMPS.
#SystemFilters = None
CustomFilters = None
from gen.const import CUSTOM_FILTERS
from ..const import CUSTOM_FILTERS
from _filterlist import FilterList
from _genericfilter import GenericFilter, GenericFilterFactory
from _paramfilter import ParamFilter

4
src/gen/filters/_filterlist.py
View File

@ -34,8 +34,8 @@ import sys
# GRAMPS modules
#
#-------------------------------------------------------------------------
from gen.filters._filterparser import FilterParser
from gen.plug import BasePluginManager
from _filterparser import FilterParser
from ..plug import BasePluginManager
PLUGMAN = BasePluginManager.get_instance()
#-------------------------------------------------------------------------

6
src/gen/filters/_filterparser.py
View File

@ -26,15 +26,15 @@
#
#-------------------------------------------------------------------------
from xml.sax import handler
from gen.ggettext import gettext as _
from ..ggettext import gettext as _
#-------------------------------------------------------------------------
#
# Gramps modules
#
#-------------------------------------------------------------------------
from gen.filters._genericfilter import GenericFilterFactory
from gen.filters import rules
from _genericfilter import GenericFilterFactory
import rules
#-------------------------------------------------------------------------
#

36
src/gen/filters/_genericfilter.py
View File

@ -26,7 +26,23 @@
Package providing filtering framework for GRAMPS.
"""
from __future__ import with_statement
import gen.lib
#------------------------------------------------------------------------
#
# Gramps imports
#
#------------------------------------------------------------------------
from ..lib.person import Person
from ..lib.family import Family
from ..lib.src import Source
from ..lib.citation import Citation
from ..lib.event import Event
from ..lib.place import Place
from ..lib.repo import Repository
from ..lib.mediaobj import MediaObject
from ..lib.note import Note
from ..lib.tag import Tag
#-------------------------------------------------------------------------
#
# GenericFilter
@ -110,7 +126,7 @@ class GenericFilter(object):
return db.get_person_cursor()
def make_obj(self):
return gen.lib.Person()
return Person()
def find_from_handle(self, db, handle):
return db.get_person_from_handle(handle)
@ -244,7 +260,7 @@ class GenericFamilyFilter(GenericFilter):
return db.get_family_cursor()
def make_obj(self):
return gen.lib.Family()
return Family()
def find_from_handle(self, db, handle):
return db.get_family_from_handle(handle)
@ -258,7 +274,7 @@ class GenericEventFilter(GenericFilter):
return db.get_event_cursor()
def make_obj(self):
return gen.lib.Event()
return Event()
def find_from_handle(self, db, handle):
return db.get_event_from_handle(handle)
@ -272,7 +288,7 @@ class GenericSourceFilter(GenericFilter):
return db.get_source_cursor()
def make_obj(self):
return gen.lib.Source()
return Source()
def find_from_handle(self, db, handle):
return db.get_source_from_handle(handle)
@ -286,7 +302,7 @@ class GenericCitationFilter(GenericFilter):
return db.get_citation_cursor()
def make_obj(self):
return gen.lib.Citation()
return Citation()
def find_from_handle(self, db, handle):
return db.get_citation_from_handle(handle)
@ -300,7 +316,7 @@ class GenericPlaceFilter(GenericFilter):
return db.get_place_cursor()
def make_obj(self):
return gen.lib.Place()
return Place()
def find_from_handle(self, db, handle):
return db.get_place_from_handle(handle)
@ -314,7 +330,7 @@ class GenericMediaFilter(GenericFilter):
return db.get_media_cursor()
def make_obj(self):
return gen.lib.MediaObject()
return MediaObject()
def find_from_handle(self, db, handle):
return db.get_object_from_handle(handle)
@ -328,7 +344,7 @@ class GenericRepoFilter(GenericFilter):
return db.get_repository_cursor()
def make_obj(self):
return gen.lib.Repository()
return Repository()
def find_from_handle(self, db, handle):
return db.get_repository_from_handle(handle)
@ -342,7 +358,7 @@ class GenericNoteFilter(GenericFilter):
return db.get_note_cursor()
def make_obj(self):
return gen.lib.Note()
return Note()
def find_from_handle(self, db, handle):
return db.get_note_from_handle(handle)

4
src/gen/filters/_paramfilter.py
View File

@ -29,8 +29,8 @@ Package providing filtering framework for GRAMPS.
# GRAMPS modules
#
#-------------------------------------------------------------------------
from gen.filters._genericfilter import GenericFilter
from gen.errors import FilterError
from _genericfilter import GenericFilter
from ..errors import FilterError
#-------------------------------------------------------------------------
#

39
src/gen/filters/rules/__init__.py
View File

@ -68,20 +68,27 @@ _Everything Match every object in the database
"""
# Need to expose this to be available for filter plugins:
# the plugins should say: from gen.filters.rules import Rule
from gen.filters.rules._rule import Rule
# the plugins should say: from .. import Rule
from _rule import Rule
from gen.filters.rules._everything import Everything
from gen.filters.rules._hasgrampsid import HasGrampsId
from gen.filters.rules._isprivate import IsPrivate
from gen.filters.rules._ispublic import IsPublic
from gen.filters.rules._hastextmatchingsubstringof import HasTextMatchingSubstringOf
from gen.filters.rules._hastextmatchingregexpof import HasTextMatchingRegexpOf
from gen.filters.rules._matchesfilterbase import MatchesFilterBase
from gen.filters.rules._matcheseventfilterbase import MatchesEventFilterBase
from gen.filters.rules._matchessourceconfidencebase import MatchesSourceConfidenceBase
from gen.filters.rules._matchessourcefilterbase import MatchesSourceFilterBase
from gen.filters.rules._changedsincebase import ChangedSinceBase
from gen.filters.rules import (person, family, event, source, citation, place,
media, repository, note)
from _everything import Everything
from _hasgrampsid import HasGrampsId
from _isprivate import IsPrivate
from _ispublic import IsPublic
from _hastextmatchingsubstringof import HasTextMatchingSubstringOf
from _hastextmatchingregexpof import HasTextMatchingRegexpOf
from _matchesfilterbase import MatchesFilterBase
from _matcheseventfilterbase import MatchesEventFilterBase
from _matchessourceconfidencebase import MatchesSourceConfidenceBase
from _matchessourcefilterbase import MatchesSourceFilterBase
from _changedsincebase import ChangedSinceBase
#object filters
import person
import family
import event
import source
import citation
import place
import media
import repository
import note

4
src/gen/filters/rules/_changedsincebase.py
View File

@ -26,7 +26,7 @@
# Standard Python modules
#
#-------------------------------------------------------------------------
from gen.ggettext import gettext as _
from ...ggettext import gettext as _
import re
import time
@ -35,7 +35,7 @@ import time
# GRAMPS modules
#
#-------------------------------------------------------------------------
from gen.filters.rules import Rule
from . import Rule
#-------------------------------------------------------------------------
#

4
src/gen/filters/rules/_everything.py
View File

@ -25,14 +25,14 @@
# Standard Python modules
#
#-------------------------------------------------------------------------
from gen.ggettext import gettext as _
from ...ggettext import gettext as _
#-------------------------------------------------------------------------
#
# GRAMPS modules
#
#-------------------------------------------------------------------------
from gen.filters.rules import Rule
from . import Rule
#-------------------------------------------------------------------------
#

6
src/gen/filters/rules/_hasattributebase.py
View File

@ -25,15 +25,15 @@
# Standard Python modules
#
#-------------------------------------------------------------------------
from gen.ggettext import gettext as _
from ...ggettext import gettext as _
#-------------------------------------------------------------------------
#
# GRAMPS modules
#
#-------------------------------------------------------------------------
from gen.lib import AttributeType
from gen.filters.rules import Rule
from ...lib.attrtype import AttributeType
from . import Rule
#-------------------------------------------------------------------------
#

8
src/gen/filters/rules/_hascitationbase.py
View File

@ -26,15 +26,15 @@
# Standard Python modules
#
#-------------------------------------------------------------------------
from gen.ggettext import gettext as _
from ...ggettext import gettext as _
#-------------------------------------------------------------------------
#
# GRAMPS modules
#
#-------------------------------------------------------------------------
import gen.datehandler
from gen.filters.rules import Rule
from ...datehandler import parser
from . import Rule
#-------------------------------------------------------------------------
#
@ -58,7 +58,7 @@ class HasCitationBase(Rule):
self.date = None
try:
if self.list[1]:
self.date = gen.datehandler.parser.parse(self.list[1])
self.date = parser.parse(self.list[1])
except:
pass

12
src/gen/filters/rules/_haseventbase.py
View File

@ -25,17 +25,17 @@
# Standard Python modules
#
#-------------------------------------------------------------------------
from gen.ggettext import gettext as _
from ...ggettext import gettext as _
#-------------------------------------------------------------------------
#
# GRAMPS modules
#
#-------------------------------------------------------------------------
import gen.datehandler
from gen.lib import EventType
from gen.filters.rules import Rule
from gen.utils.db import get_participant_from_event
from ...datehandler import parser
from ...lib.eventtype import EventType
from . import Rule
from ...utils.db import get_participant_from_event
#-------------------------------------------------------------------------
#
@ -64,7 +64,7 @@ class HasEventBase(Rule):
self.etype = None
try:
if self.list[1]:
self.date = gen.datehandler.parser.parse(self.list[1])
self.date = parser.parse(self.list[1])
except:
pass

4
src/gen/filters/rules/_hasgallerybase.py
View File

@ -28,14 +28,14 @@
# Standard Python modules
#
#-------------------------------------------------------------------------
from gen.ggettext import gettext as _
from ...ggettext import gettext as _
#-------------------------------------------------------------------------
#
# GRAMPS modules
#
#-------------------------------------------------------------------------
from gen.filters.rules import Rule
from . import Rule
#-------------------------------------------------------------------------
# "People who have images"

4
src/gen/filters/rules/_hasgrampsid.py
View File

@ -26,14 +26,14 @@
# Standard Python modules
#
#-------------------------------------------------------------------------
from gen.ggettext import gettext as _
from ...ggettext import gettext as _
#-------------------------------------------------------------------------
#
# GRAMPS modules
#
#-------------------------------------------------------------------------
from gen.filters.rules import Rule
from . import Rule
#-------------------------------------------------------------------------
#

4
src/gen/filters/rules/_hasldsbase.py
View File

@ -28,7 +28,7 @@
# Standard Python modules
#
#-------------------------------------------------------------------------
from gen.ggettext import gettext as _
from ...ggettext import gettext as _
#-------------------------------------------------------------------------
#
@ -36,7 +36,7 @@ from gen.ggettext import gettext as _
#
#-------------------------------------------------------------------------
from gen.filters.rules import Rule
from . import Rule
#-------------------------------------------------------------------------
#

4
src/gen/filters/rules/_hasnotebase.py
View File

@ -29,14 +29,14 @@
# Standard Python modules
#
#-------------------------------------------------------------------------
from gen.ggettext import gettext as _
from ...ggettext import gettext as _
#-------------------------------------------------------------------------
#
# GRAMPS modules
#
#-------------------------------------------------------------------------
from gen.filters.rules import Rule
from . import Rule
#-------------------------------------------------------------------------
# "Objects having notes"

4
src/gen/filters/rules/_hasnoteregexbase.py
View File

@ -26,14 +26,14 @@
#
#-------------------------------------------------------------------------
import re
from gen.ggettext import gettext as _
from ...ggettext import gettext as _
#-------------------------------------------------------------------------
#
# GRAMPS modules
#
#-------------------------------------------------------------------------
from gen.filters.rules import Rule
from . import Rule
#-------------------------------------------------------------------------
# "People having notes that contain a substring"

4
src/gen/filters/rules/_hasnotesubstrbase.py
View File

@ -25,14 +25,14 @@
# Standard Python modules
#
#-------------------------------------------------------------------------
from gen.ggettext import gettext as _
from ...ggettext import gettext as _
#-------------------------------------------------------------------------
#
# GRAMPS modules
#
#-------------------------------------------------------------------------
from gen.filters.rules import Rule
from . import Rule
#-------------------------------------------------------------------------
# "People having notes that contain a substring"

4
src/gen/filters/rules/_hasreferencecountbase.py
View File

@ -25,14 +25,14 @@
# Standard Python modules
#
#-------------------------------------------------------------------------
from gen.ggettext import gettext as _
from ...ggettext import gettext as _
#-------------------------------------------------------------------------
#
# GRAMPS modules
#
#-------------------------------------------------------------------------
from gen.filters.rules import Rule
from . import Rule
#-------------------------------------------------------------------------
# "Objects with a certain reference count"

4
src/gen/filters/rules/_hassourcebase.py
View File

@ -26,14 +26,14 @@
# Standard Python modules
#
#-------------------------------------------------------------------------
from gen.ggettext import gettext as _
from ...ggettext import gettext as _
#-------------------------------------------------------------------------
#
# GRAMPS modules
#
#-------------------------------------------------------------------------
from gen.filters.rules import Rule
from . import Rule
#-------------------------------------------------------------------------
#

4
src/gen/filters/rules/_hassourcecountbase.py
View File

@ -28,14 +28,14 @@
# Standard Python modules
#
#-------------------------------------------------------------------------
from gen.ggettext import gettext as _
from ...ggettext import gettext as _
#-------------------------------------------------------------------------
#
# GRAMPS modules
#
#-------------------------------------------------------------------------
from gen.filters.rules import Rule
from . import Rule
#-------------------------------------------------------------------------
# "Objects having sources"

4
src/gen/filters/rules/_hassourceofbase.py
View File

@ -26,14 +26,14 @@
# Standard Python modules
#
#-------------------------------------------------------------------------
from gen.ggettext import gettext as _
from ...ggettext import gettext as _
#-------------------------------------------------------------------------
#
# GRAMPS modules
#
#-------------------------------------------------------------------------
from gen.filters.rules import Rule
from . import Rule
#-------------------------------------------------------------------------
#

4
src/gen/filters/rules/_hastagbase.py
View File

@ -27,14 +27,14 @@ Rule that checks for an object with a particular tag.
# Standard Python modules
#
#-------------------------------------------------------------------------
from gen.ggettext import gettext as _
from ...ggettext import gettext as _
#-------------------------------------------------------------------------
#
# GRAMPS modules
#
#-------------------------------------------------------------------------
from gen.filters.rules import Rule
from . import Rule
#-------------------------------------------------------------------------
#

2
src/gen/filters/rules/_hastextmatchingregexpof.py
View File

@ -25,7 +25,7 @@
# GRAMPS modules
#
#-------------------------------------------------------------------------
from gen.filters.rules import HasTextMatchingSubstringOf
from . import HasTextMatchingSubstringOf
#-------------------------------------------------------------------------
# "HasTextMatchingRegexOf"

4
src/gen/filters/rules/_hastextmatchingsubstringof.py
View File

@ -25,14 +25,14 @@
# Standard Python modules
#
#-------------------------------------------------------------------------
from gen.ggettext import gettext as _
from ...ggettext import gettext as _
#-------------------------------------------------------------------------
#
# GRAMPS modules
#
#-------------------------------------------------------------------------
from gen.filters.rules import Rule
from . import Rule
#-------------------------------------------------------------------------
# "HasTextMatchingSubstringOf"

4
src/gen/filters/rules/_isprivate.py
View File

@ -23,14 +23,14 @@
# Standard Python modules
#
#-------------------------------------------------------------------------
from gen.ggettext import gettext as _
from ...ggettext import gettext as _
#-------------------------------------------------------------------------
#
# GRAMPS modules
#
#-------------------------------------------------------------------------
from gen.filters.rules import Rule
from . import Rule
#-------------------------------------------------------------------------
# "People marked private"

2
src/gen/filters/rules/_ispublic.py
View File

@ -26,7 +26,7 @@
# GRAMPS modules
#
#-------------------------------------------------------------------------
from gen.filters.rules import Rule
from . import Rule
#-------------------------------------------------------------------------
# "People marked public"

4
src/gen/filters/rules/_matcheseventfilterbase.py
View File

@ -25,14 +25,14 @@
# Standard Python modules
#
#-------------------------------------------------------------------------
from gen.ggettext import gettext as _
from ...ggettext import gettext as _
#-------------------------------------------------------------------------
#
# GRAMPS modules
#
#-------------------------------------------------------------------------
from gen.filters.rules import MatchesFilterBase
from . import MatchesFilterBase
#-------------------------------------------------------------------------
#

22
src/gen/filters/rules/_matchesfilterbase.py
View File

@ -25,15 +25,15 @@
# Standard Python modules
#
#-------------------------------------------------------------------------
from gen.ggettext import gettext as _
from ...ggettext import gettext as _
#-------------------------------------------------------------------------
#
# GRAMPS modules
#
#-------------------------------------------------------------------------
import gen.filters
from gen.filters.rules import Rule
from .. import CustomFilters
from . import Rule
#-------------------------------------------------------------------------
#
@ -55,24 +55,24 @@ class MatchesFilterBase(Rule):
category = _('General filters')
def prepare(self, db):
if gen.filters.CustomFilters:
filters = gen.filters.CustomFilters.get_filters_dict(self.namespace)
if CustomFilters:
filters = CustomFilters.get_filters_dict(self.namespace)
if self.list[0] in filters:
filt = filters[self.list[0]]
for rule in filt.flist:
rule.requestprepare(db)
def reset(self):
if gen.filters.CustomFilters:
filters = gen.filters.CustomFilters.get_filters_dict(self.namespace)
if CustomFilters:
filters = CustomFilters.get_filters_dict(self.namespace)
if self.list[0] in filters:
filt = filters[self.list[0]]
for rule in filt.flist:
rule.requestreset()
def apply(self, db, obj):
if gen.filters.CustomFilters:
filters = gen.filters.CustomFilters.get_filters_dict(self.namespace)
if CustomFilters:
filters = CustomFilters.get_filters_dict(self.namespace)
if self.list[0] in filters:
filt = filters[self.list[0]]
return filt.check(db, obj.handle)
@ -82,8 +82,8 @@ class MatchesFilterBase(Rule):
"""
Return the selected filter or None.
"""
if gen.filters.CustomFilters:
filters = gen.filters.CustomFilters.get_filters_dict(self.namespace)
if CustomFilters:
filters = CustomFilters.get_filters_dict(self.namespace)
if self.list[0] in filters:
return filters[self.list[0]]
return None

4
src/gen/filters/rules/_matchessourceconfidencebase.py
View File

@ -29,14 +29,14 @@
# Standard Python modules
#
#-------------------------------------------------------------------------
from gen.ggettext import gettext as _
from ...ggettext import gettext as _
#-------------------------------------------------------------------------
#
# GRAMPS modules
#
#-------------------------------------------------------------------------
from gen.filters.rules import Rule
from . import Rule
#-------------------------------------------------------------------------
# "Confidence level"

4
src/gen/filters/rules/_matchessourcefilterbase.py
View File

@ -26,14 +26,14 @@
# Standard Python modules
#
#-------------------------------------------------------------------------
from gen.ggettext import gettext as _
from ...ggettext import gettext as _
#-------------------------------------------------------------------------
#
# GRAMPS modules
#
#-------------------------------------------------------------------------
from gen.filters.rules import MatchesFilterBase
from . import MatchesFilterBase
#-------------------------------------------------------------------------
#

4
src/gen/filters/rules/_regexpidbase.py
View File

@ -26,14 +26,14 @@
#
#-------------------------------------------------------------------------
import re
from gen.ggettext import gettext as _
from ...ggettext import gettext as _
#-------------------------------------------------------------------------
#
# GRAMPS modules
#
#-------------------------------------------------------------------------
from gen.filters.rules import Rule
from . import Rule
#-------------------------------------------------------------------------
#

2
src/gen/filters/rules/_rule.py
View File

@ -30,7 +30,7 @@ Base class for filter rules.
# Standard Python modules
#
#-------------------------------------------------------------------------
from gen.ggettext import gettext as _
from ...ggettext import gettext as _
import re
#-------------------------------------------------------------------------

4
src/gen/filters/rules/citation/_allcitations.py
View File

@ -26,14 +26,14 @@
# Standard Python modules
#
#-------------------------------------------------------------------------
from gen.ggettext import gettext as _
from ....ggettext import gettext as _
#-------------------------------------------------------------------------
#
# GRAMPS modules
#
#-------------------------------------------------------------------------
from gen.filters.rules._everything import Everything
from .._everything import Everything
#-------------------------------------------------------------------------
#

4
src/gen/filters/rules/citation/_changedsince.py
View File

@ -26,14 +26,14 @@
# Standard Python modules
#
#-------------------------------------------------------------------------
from gen.ggettext import gettext as _
from ....ggettext import gettext as _
#-------------------------------------------------------------------------
#
# GRAMPS modules
#
#-------------------------------------------------------------------------
from gen.filters.rules._changedsincebase import ChangedSinceBase
from .._changedsincebase import ChangedSinceBase
#-------------------------------------------------------------------------
#

4
src/gen/filters/rules/citation/_citationprivate.py
View File

@ -26,14 +26,14 @@
# Standard Python modules
#
#-------------------------------------------------------------------------
from gen.ggettext import gettext as _
from ....ggettext import gettext as _
#-------------------------------------------------------------------------
#
# GRAMPS modules
#
#-------------------------------------------------------------------------
from gen.filters.rules._isprivate import IsPrivate
from .._isprivate import IsPrivate
#-------------------------------------------------------------------------
# "Family marked private"

8
src/gen/filters/rules/citation/_hascitation.py
View File

@ -28,15 +28,15 @@ Filter rule to match citation data.
# Standard Python modules
#
#-------------------------------------------------------------------------
from gen.ggettext import gettext as _
from ....ggettext import gettext as _
#-------------------------------------------------------------------------
#
# GRAMPS modules
#
#-------------------------------------------------------------------------
from gen.filters.rules import Rule
import gen.datehandler
from .. import Rule
from ....datehandler import parser
#-------------------------------------------------------------------------
#
@ -57,7 +57,7 @@ class HasCitation(Rule):
self.date = None
try:
if self.list[1]:
self.date = gen.datehandler.parser.parse(self.list[1])
self.date = parser.parse(self.list[1])
except:
pass

4
src/gen/filters/rules/citation/_hasgallery.py
View File

@ -28,14 +28,14 @@
# Standard Python modules
#
#-------------------------------------------------------------------------
from gen.ggettext import gettext as _
from ....ggettext import gettext as _
#-------------------------------------------------------------------------
#
# GRAMPS modules
#
#-------------------------------------------------------------------------
from gen.filters.rules._hasgallerybase import HasGalleryBase
from .._hasgallerybase import HasGalleryBase
#-------------------------------------------------------------------------
# "Sources who have media object reference"

4
src/gen/filters/rules/citation/_hasidof.py
View File

@ -26,14 +26,14 @@
# Standard Python modules
#
#-------------------------------------------------------------------------
from gen.ggettext import gettext as _
from ....ggettext import gettext as _
#-------------------------------------------------------------------------
#
# GRAMPS modules
#
#-------------------------------------------------------------------------
from gen.filters.rules import HasGrampsId
from .. import HasGrampsId
#-------------------------------------------------------------------------
#

4
src/gen/filters/rules/citation/_hasnote.py
View File

@ -29,14 +29,14 @@
# Standard Python modules
#
#-------------------------------------------------------------------------
from gen.ggettext import gettext as _
from ....ggettext import gettext as _
#-------------------------------------------------------------------------
#
# GRAMPS modules
#
#-------------------------------------------------------------------------
from gen.filters.rules._hasnotebase import HasNoteBase
from .._hasnotebase import HasNoteBase
#-------------------------------------------------------------------------
# "Sources having notes"

4
src/gen/filters/rules/citation/_hasnotematchingsubstringof.py
View File

@ -26,14 +26,14 @@
# Standard Python modules
#
#-------------------------------------------------------------------------
from gen.ggettext import gettext as _
from ....ggettext import gettext as _
#-------------------------------------------------------------------------
#
# GRAMPS modules
#
#-------------------------------------------------------------------------
from gen.filters.rules._hasnotesubstrbase import HasNoteSubstrBase
from .._hasnotesubstrbase import HasNoteSubstrBase
#-------------------------------------------------------------------------
# "Events having notes that contain a substring"

4
src/gen/filters/rules/citation/_hasnoteregexp.py
View File

@ -26,14 +26,14 @@
# Standard Python modules
#
#-------------------------------------------------------------------------
from gen.ggettext import gettext as _
from ....ggettext import gettext as _
#-------------------------------------------------------------------------
#
# GRAMPS modules
#
#-------------------------------------------------------------------------
from gen.filters.rules._hasnoteregexbase import HasNoteRegexBase
from .._hasnoteregexbase import HasNoteRegexBase
#-------------------------------------------------------------------------
# "Sources having notes that contain a substring"

4
src/gen/filters/rules/citation/_hasreferencecountof.py
View File

@ -26,14 +26,14 @@
# Standard Python modules
#
#-------------------------------------------------------------------------
from gen.ggettext import gettext as _
from ....ggettext import gettext as _
#-------------------------------------------------------------------------
#
# GRAMPS modules
#
#-------------------------------------------------------------------------
from gen.filters.rules._hasreferencecountbase import HasReferenceCountBase
from .._hasreferencecountbase import HasReferenceCountBase
#-------------------------------------------------------------------------
# "Source objects with a certain reference count"

4
src/gen/filters/rules/citation/_hassource.py
View File

@ -29,14 +29,14 @@ Filter rule to match citation with a particular source.
# Standard Python modules
#
#-------------------------------------------------------------------------
from gen.ggettext import gettext as _
from ....ggettext import gettext as _
#-------------------------------------------------------------------------
#
# GRAMPS modules
#
#-------------------------------------------------------------------------
from gen.filters.rules._hassourcebase import HasSourceBase
from .._hassourcebase import HasSourceBase
#-------------------------------------------------------------------------
#

4
src/gen/filters/rules/citation/_matchesfilter.py
View File

@ -26,14 +26,14 @@
# Standard Python modules
#
#-------------------------------------------------------------------------
from gen.ggettext import gettext as _
from ....ggettext import gettext as _
#-------------------------------------------------------------------------
#
# GRAMPS modules
#
#-------------------------------------------------------------------------
from gen.filters.rules._matchesfilterbase import MatchesFilterBase
from .._matchesfilterbase import MatchesFilterBase
#-------------------------------------------------------------------------
#

4
src/gen/filters/rules/citation/_matchespagesubstringof.py
View File

@ -25,14 +25,14 @@
# Standard Python modules
#
#-------------------------------------------------------------------------
from gen.ggettext import gettext as _
from ....ggettext import gettext as _
#-------------------------------------------------------------------------
#
# GRAMPS modules
#
#-------------------------------------------------------------------------
from gen.filters.rules import Rule
from .. import Rule
#-------------------------------------------------------------------------
# "Sources having a title that contain a substring"

4
src/gen/filters/rules/citation/_matchesrepositoryfilter.py
View File

@ -28,14 +28,14 @@
#-------------------------------------------------------------------------
import logging
LOG = logging.getLogger(".citation")
from gen.ggettext import gettext as _
from ....ggettext import gettext as _
#-------------------------------------------------------------------------
#
# GRAMPS modules
#
#-------------------------------------------------------------------------
from gen.filters.rules import MatchesFilterBase
from .. import MatchesFilterBase
#-------------------------------------------------------------------------
# "Sources which reference a repository by selection"

4
src/gen/filters/rules/citation/_matchessourcefilter.py
View File

@ -27,14 +27,14 @@
# Standard Python modules
#
#-------------------------------------------------------------------------
from gen.ggettext import gettext as _
from ....ggettext import gettext as _
#-------------------------------------------------------------------------
#
# GRAMPS modules
#
#-------------------------------------------------------------------------
from gen.filters.rules import MatchesFilterBase
from .. import MatchesFilterBase
#-------------------------------------------------------------------------
#

4
src/gen/filters/rules/citation/_regexpidof.py
View File

@ -26,14 +26,14 @@
# Standard Python modules
#
#-------------------------------------------------------------------------
from gen.ggettext import gettext as _
from ....ggettext import gettext as _
#-------------------------------------------------------------------------
#
# GRAMPS modules
#
#-------------------------------------------------------------------------
from gen.filters.rules._regexpidbase import RegExpIdBase
from .._regexpidbase import RegExpIdBase
#-------------------------------------------------------------------------
#

2
src/gen/filters/rules/event/__init__.py
View File

@ -26,7 +26,7 @@
Package providing filter rules for GRAMPS.
"""
from gen.filters.rules._haseventbase import HasEventBase as HasEvent
from .._haseventbase import HasEventBase as HasEvent
from _hastype import HasType
from _allevents import AllEvents

4
src/gen/filters/rules/event/_allevents.py
View File

@ -25,14 +25,14 @@
# Standard Python modules
#
#-------------------------------------------------------------------------
from gen.ggettext import gettext as _
from ....ggettext import gettext as _
#-------------------------------------------------------------------------
#
# GRAMPS modules
#
#-------------------------------------------------------------------------
from gen.filters.rules._everything import Everything
from .._everything import Everything
#-------------------------------------------------------------------------
#

4
src/gen/filters/rules/event/_changedsince.py
View File

@ -26,14 +26,14 @@
# Standard Python modules
#
#-------------------------------------------------------------------------
from gen.ggettext import gettext as _
from ....ggettext import gettext as _
#-------------------------------------------------------------------------
#
# GRAMPS modules
#
#-------------------------------------------------------------------------
from gen.filters.rules._changedsincebase import ChangedSinceBase
from .._changedsincebase import ChangedSinceBase
#-------------------------------------------------------------------------
#

4
src/gen/filters/rules/event/_eventprivate.py
View File

@ -25,14 +25,14 @@
# Standard Python modules
#
#-------------------------------------------------------------------------
from gen.ggettext import gettext as _
from ....ggettext import gettext as _
#-------------------------------------------------------------------------
#
# GRAMPS modules
#
#-------------------------------------------------------------------------
from gen.filters.rules._isprivate import IsPrivate
from .._isprivate import IsPrivate
#-------------------------------------------------------------------------
# "Family marked private"

4
src/gen/filters/rules/event/_hasattribute.py
View File

@ -25,14 +25,14 @@
# Standard Python modules
#
#-------------------------------------------------------------------------
from gen.ggettext import gettext as _
from ....ggettext import gettext as _
#-------------------------------------------------------------------------
#
# GRAMPS modules
#
#-------------------------------------------------------------------------
from gen.filters.rules._hasattributebase import HasAttributeBase
from .._hasattributebase import HasAttributeBase
#-------------------------------------------------------------------------
#

4
src/gen/filters/rules/event/_hascitation.py
View File

@ -29,14 +29,14 @@ Filter rule to match event with a particular citation.
# Standard Python modules
#
#-------------------------------------------------------------------------
from gen.ggettext import gettext as _
from ....ggettext import gettext as _
#-------------------------------------------------------------------------
#
# GRAMPS modules
#
#-------------------------------------------------------------------------
from gen.filters.rules._hascitationbase import HasCitationBase
from .._hascitationbase import HasCitationBase
#-------------------------------------------------------------------------
#

10
src/gen/filters/rules/event/_hasdata.py
View File

@ -25,16 +25,16 @@
# Standard Python modules
#
#-------------------------------------------------------------------------
from gen.ggettext import gettext as _
from ....ggettext import gettext as _
#-------------------------------------------------------------------------
#
# GRAMPS modules
#
#-------------------------------------------------------------------------
import gen.datehandler
from gen.lib import EventType
from gen.filters.rules import Rule
from ....datehandler import parser
from ....lib.eventtype import EventType
from .. import Rule
#-------------------------------------------------------------------------
#
@ -63,7 +63,7 @@ class HasData(Rule):
self.event_type.set_from_xml_str(self.list[0])
if self.date:
self.date = gen.datehandler.parser.parse(self.date)
self.date = parser.parse(self.date)
def apply(self, db, event):
if self.event_type and event.get_type() != self.event_type:

Some files were not shown because too many files have changed in this diff Show More