ready for alpha4

svn: r21222

.gitignore

@@ -2,11 +2,12 @@
 *.py[cod]
 
 # Distutils
+MANIFEST
 build/
-sdist/
+dist/
 
 # Gramps
-gramps/data/tips.xml
+data/tips.xml
 gramps/gen/const.py
 gramps/plugins/lib/holidays.xml
 po/.intltool-merge-cache

MANIFEST.in

@@ -11,34 +11,22 @@ include TestPlan.txt
 recursive-include data *
 recursive-include debian *
 recursive-include docs *
+recursive-include gramps *
 recursive-include help *
+recursive-include images *
 recursive-include mac *
 recursive-include po *
-recursive-include gramps *
 recursive-include test *
 recursive-include windows *
 
 # Remove files created in the build
-exclude data/gramps.desktop
-exclude data/gramps.keys
-exclude data/gramps.xml
-recursive-exclude data/man *.1
-recursive-exclude data/man *.1.gz
-exclude gramps/const.py
-exclude gramps/data/tips.xml
+exclude data/tips.xml
+exclude gramps/gen/const.py
 exclude gramps/plugins/lib/holidays.xml
-exclude po/*.gmo
 exclude po/.intltool-merge-cache
-exclude po/stamp-it
-exclude po/POTFILES
 global-exclude *.pyc
-global-exclude *.py~
 global-exclude *.pyo
-global-exclude *.bak
 
 # Remove directories which should not be included in the distribution
 prune gramps/guiQML
-prune gramps/webapp
-
-# Remove Makefiles used by autotools
-global-exclude Makefile*
+#prune gramps/webapp

NEWS

@@ -1,3 +1,20 @@
+2012-10-28
+Version 3.4.2 -- the "We're all individuals!" bug fix release.
+* Some fixes on NarrativeWeb report
+* Some fixes on book report
+* Improvement on database path interface and user's preferences
+* Consistency on Name display and regex support
+* Some platform-specific fixes for Windows system environment
+* Better support for media links on Gedcom file format
+* Fix possible incorrect family relations on Gedcom file format
+* Various fixes on citation records
+* Fix and improve places handling on Geography views
+* Fix on command line arguments
+* Consistency on PDF file format
+* New language: Greek
+* Various updated translations
+* Changelog: http://www.gramps-project.org/bugs/changelog_page.php?version_id=32
+
 2012-08-23
 Version 3.4.1 -- The "A tiger? In Africa?!" bug fix release.
 Mention in the release that upgrading is advised for two critical issues:

README

@@ -8,6 +8,7 @@ The following packages *MUST* be installed in order for Gramps to work:
    Python 2.7 or greater, Python 3.2 or greater (python version cannot be mixed)
    GTK 3.0 or greater
    pygobject 3.3.2 or greater
+   cairo, pango, pangocairo with instrospection bindings (the gi packages)
    librsvg2 (svg icon view)
    xdg-utils
 
@@ -23,7 +24,7 @@ to your language:
 The following packages are *STRONGLY RECOMMENDED* to be installed:
    osmgpsmap        Used to show maps in the geography view. 
                     Without this the GeoView will not be active, see
-                    http://gramps-project.org/wiki/index.php?title=Gramps_3.3_Wiki_Manual_-_Main_Window#Geography_Category
+                    http://gramps-project.org/wiki/index.php?title=Gramps_4.0_Wiki_Manual_-_Main_Window#Geography_Category
                     The package is named osmgpsmap, osm-gps-map
                     or python-osmgpsmap. Or obtain it from: http://nzjrs.github.com/osm-gps-map/
    GraphViz         Enable creation of graphs using GraphViz engine.
@@ -38,6 +39,14 @@ The following packages are optional
                     enchant. A version of gtkspell with gobject introspection
                     is needed, so minimally version 3.0.0
 
+   rcs              The GNU Revision Control System (RCS) can be used to manage
+                    multiple revisions of your family trees. See info at
+                    http://www.gramps-project.org/wiki/index.php?title=Gramps_4.0_Wiki_Manual_-_Manage_Family_Trees#Archiving_a_Family_Tree
+                    Only rcs is needed, NO python bindings are required
+
+   PIL              Python Image Library is needed to convert non jpg images to
+                    jpg so as to include them in LaTeX output
+
    ttf-freefont     More font support in the reports
 
    gir-webkit       GObject introspection data of WebKit is required for the
@@ -62,9 +71,6 @@ No longer needed in 3.2:
 No longer needed in 3.1:
    yelp             Gnome help browser. At the moment no help is shipped
 
-Remark: There is a conflict when using python-gnome2 in Ubuntu. This is evident
-        with the error: TypeError: Error when calling the metaclass bases
-                                   metaclass conflict
 
 Documentation
 ---------------------------------

RELEASE_NOTES

@@ -1,4 +1,4 @@
-"UNSTABLE Gramps 4.0.0 Alpha1 release.
+"UNSTABLE Gramps 4.0.0 Alpha4 release.
 
 This is a technology preview to allow plugin writers and packagers-installer 
 writers to update their plugins and scripts. This release is not production 

data/man/Makefile.am

@@ -1,14 +0,0 @@
-# This is the data/man level Makefile for Gramps
-# $Id$
-
-SUBDIRS = fr sv nl pl cs pt_BR
-
-man_IN_FILES = gramps.1.in
-man_MANS = $(man_IN_FILES:.1.in=.1)
-
-EXTRA_DIST = $(man_MANS) $(man_IN_FILES)
-
-gramps.1: $(top_builddir)/config.status gramps.1.in
-	cd $(top_builddir) && CONFIG_FILES=data/man/$@ $(SHELL) ./config.status
-
-CLEANFILES=$(man_MANS)

data/man/conf.py

@@ -50,7 +50,7 @@ copyright = u'2012, Gramps project'
 # The short X.Y version.
 version = '4.0'
 # The full version, including alpha/beta/rc tags.
-release = '4.0.0'
+release = '4.0.0-alpha2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

data/man/cs/Makefile.am

@@ -1,14 +0,0 @@
-# This is the data/man/sv level Makefile for Gramps
-# $Id: Makefile.am 6189 2006-03-21 19:05:46Z rshura $
-
-man_IN_FILES = gramps.1.in
-man_MANS = $(man_IN_FILES:.1.in=.1)
-
-mandir = @mandir@/cs
-
-EXTRA_DIST = $(man_MANS) $(man_IN_FILES)
-
-gramps.1: $(top_builddir)/config.status gramps.1.in
-	cd $(top_builddir) && CONFIG_FILES=data/man/cs/$@ $(SHELL) ./config.status
-
-CLEANFILES=$(man_MANS)

data/man/cs/cs.rst

@@ -249,7 +249,9 @@ gramps(1)			     3.4.0			     gramps(1)
 
        *${PREFIX}/bin/gramps*
        
-       *${PREFIX}/share/gramps*
+       *${PREFIX}/lib/python/dist-packages/gramps/*
+       
+       *${PREFIX}/share/*
        
        *${HOME}/.gramps*
 

data/man/en.rst

@@ -1,7 +1,7 @@
 English
 =======
 
-gramps(1)                4.0.0               gramps(1)
+gramps(1)                @VERSION@               gramps(1)
 
 
 
@@ -262,11 +262,14 @@ gramps(1)                4.0.0               gramps(1)
 
 
 **KNOWN BUGS AND LIMITATIONS**
+
 **FILES**
        
        *${PREFIX}/bin/gramps*
        
-       *${PREFIX}/share/gramps*
+       *${PREFIX}/lib/python/dist-packages/gramps/*
+       
+       *${PREFIX}/share/*
        
        *${HOME}/.gramps*
 
@@ -293,4 +296,4 @@ gramps(1)                4.0.0               gramps(1)
 
 
 
-January 2013                 4.0.0               gramps(1)
+gramps(1)                 @VERSION@               gramps(1)

data/man/fr/Makefile.am

@@ -1,14 +0,0 @@
-# This is the data/man/fr level Makefile for Gramps
-# $Id$
-
-man_IN_FILES = gramps.1.in
-man_MANS = $(man_IN_FILES:.1.in=.1)
-
-mandir = @mandir@/fr
-
-EXTRA_DIST = $(man_MANS) $(man_IN_FILES)
-
-gramps.1: $(top_builddir)/config.status gramps.1.in
-	cd $(top_builddir) && CONFIG_FILES=data/man/fr/$@ $(SHELL) ./config.status
-
-CLEANFILES=$(man_MANS)

data/man/fr/conf.py

@@ -50,7 +50,7 @@ copyright = u'2012, Gramps project'
 # The short X.Y version.
 version = '4.0'
 # The full version, including alpha/beta/rc tags.
-release = '4.0.0'
+release = '4.0.0-alpha2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

data/man/fr/fr.rst

@@ -1,9 +1,7 @@
 French
 =======
 
-
-gramps(1)			     4.0.0			     gramps(1)
-
+gramps(1)                @VERSION@               gramps(1)
 
 
 **NOM**
@@ -75,8 +73,8 @@ gramps(1)			     4.0.0			     gramps(1)
           Ouvrir une *BASE_DE_DONNEES* qui doit être une base présente dans
           le répertoire des bases ou le nom d'un arbre familial existant.
           Si aucune action n'est définie, les options d'import ou d'export
-	      sont  données par la ligne de commande puis une session interac‐
-	      tive est ouverte, utilisant cette base de données.
+          sont données par la ligne de commande puis une session interactive
+          est ouverte, utilisant cette base de données.
 
           Seulement une base peut être ouverte. Si vous utilisez plusieurs
           sources, vous devez utiliser l'option d'import.
@@ -89,7 +87,7 @@ gramps(1)			     4.0.0			     gramps(1)
 
           Quand plus d'un fichier doit être importé, chacun doit être
           précédé par la commande **-i** . Ces fichiers sont importés dans le
-	      même ordre,  i.e.  **-i** *FICHIER1* **-i** *FICHIER2* et **-i** *FICHIER2* **-i**
+          même ordre,  **-i** *FICHIER1* **-i** *FICHIER2* et **-i** *FICHIER2* **-i**
           *FICHIER1* vont tous les deux produire différents IDs gramps.
 
 
@@ -154,7 +152,7 @@ gramps(1)			     4.0.0			     gramps(1)
 
 
 **Opération**
-       Si le premie argument de la ligne de commande ne commence pas par un
+       Si le premier argument de la ligne de commande ne commence pas par un
        tiret (i.e. pas d'instruction), gramps va essayer d'ouvrir la base de
        données avec le nom donné par le premier argument et démarrer une ses‐
        sion interactive, en ignorant le reste de la ligne de commande.
@@ -198,7 +196,7 @@ gramps(1)			     4.0.0			     gramps(1)
 
        Ceci ouvre un arbre familial, pour faire la même chose, mais importer
        dans un arbre familial temporaire et démarrer une session interactive,
-       on peut saisir:
+       on peut saisir :
        
           **gramps -i** *'Mon Arbre Familial'* **-i** *~/db3.gramps*
 
@@ -263,11 +261,14 @@ gramps(1)			     4.0.0			     gramps(1)
 
 
 **BUGS CONNUS ET LIMITATIONS**
+
 **FICHIERS**
 
        *${PREFIX}/bin/gramps*
        
-       *${PREFIX}/share/gramps*
+       *${PREFIX}/lib/python/dist-packages/gramps/*
+       
+       *${PREFIX}/share/*
        
        *${HOME}/.gramps*
 
@@ -296,4 +297,4 @@ gramps(1)			     4.0.0			     gramps(1)
 
 
 
-Janvier 2013			     4.0.0			     gramps(1)
+gramps(1)                 @VERSION@               gramps(1)

data/man/fr/gramps.1.in

@@ -1,4 +1,4 @@
-.TH "GRAMPS" "1" "04 December 2012" "4.0" "Gramps"
+.TH "GRAMPS" "1" "28 December 2012" "4.0" "Gramps"
 .SH NAME
 gramps \- Gramps Documentation
 .
@@ -28,10 +28,10 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.\" Man page generated from reStructeredText.
+.\" Man page generated from reStructuredText.
 .
 .sp
-gramps(1)                            4.0.0                           gramps(1)
+gramps(1)                @VERSION@               gramps(1)
 .INDENT 0.0
 .TP
 .B \fBNOM\fP
@@ -98,8 +98,8 @@ Débloquer une base de données verrouillée.
 Ouvrir une \fIBASE_DE_DONNEES\fP qui doit être une base présente dans
 le répertoire des bases ou le nom d\(aqun arbre familial existant.
 Si aucune action n\(aqest définie, les options d\(aqimport ou d\(aqexport
-sont  données par la ligne de commande puis une session interac‐
-tive est ouverte, utilisant cette base de données.
+sont données par la ligne de commande puis une session interactive
+est ouverte, utilisant cette base de données.
 .sp
 Seulement une base peut être ouverte. Si vous utilisez plusieurs
 sources, vous devez utiliser l\(aqoption d\(aqimport.
@@ -111,7 +111,7 @@ est utilisée; elle sera effacée quand vous quitterez gramps.
 .sp
 Quand plus d\(aqun fichier doit être importé, chacun doit être
 précédé par la commande \fB\-i\fP . Ces fichiers sont importés dans le
-même ordre,  i.e.  \fB\-i\fP \fIFICHIER1\fP \fB\-i\fP \fIFICHIER2\fP et \fB\-i\fP \fIFICHIER2\fP \fB\-i\fP
+même ordre,  \fB\-i\fP \fIFICHIER1\fP \fB\-i\fP \fIFICHIER2\fP et \fB\-i\fP \fIFICHIER2\fP \fB\-i\fP
 \fIFICHIER1\fP vont tous les deux produire différents IDs gramps.
 .TP
 .B \fB\-e\fP , \fB\-\-export=\fP \fIFICHIER\fP
@@ -124,8 +124,6 @@ précédé par la commande \fB\-e\fP . Ces fichiers sont importés dans le
 même ordre.
 .TP
 .B \fB\-a\fP , \fB\-\-action=\fP \fIACTION\fP
-.INDENT 7.0
-.INDENT 3.5
 Accomplir une \fIACTION\fP sur les données importées. C\(aqest effectué à
 la fin de l\(aqimportation. Les actions possibles sont \fBsummary\fP
 (comme le rapport \-> Afficher \-> Statistiques sur la base),
@@ -151,18 +149,14 @@ module disponible, un message d\(aqerreur sera ajouté.
 \fBshow=all\fP
 Cette option produit une liste avec les noms des options
 disponibles pour un rapport donné.
-.UNINDENT
-.UNINDENT
 .sp
 \fBshow=optionname\fP
 Cette option affiche une description de toutes les fonctionnalités
 proposées par optionname, aussi bien les types que les valeurs pour une option.
-.INDENT 7.0
-.TP
-.B Utiliser les options ci\-dessus pour trouver tout sur un rapport
+.sp
+Utiliser les options ci\-dessus pour trouver tout sur un rapport
 choisi.
 .UNINDENT
-.UNINDENT
 .sp
 Quand plus d\(aqune action doit être effectuée, chacune doit être précédée
 par la commande \fB\-a\fP . Les actions seront réalisées une à une, dans
@@ -178,7 +172,7 @@ Imprime le numéro de version pour gramps puis quitte.
 .UNINDENT
 .TP
 .B \fBOpération\fP
-Si le premie argument de la ligne de commande ne commence pas par un
+Si le premier argument de la ligne de commande ne commence pas par un
 tiret (i.e. pas d\(aqinstruction), gramps va essayer d\(aqouvrir la base de
 données avec le nom donné par le premier argument et démarrer une ses‐
 sion interactive, en ignorant le reste de la ligne de commande.
@@ -218,7 +212,7 @@ saisir:
 .sp
 Ceci ouvre un arbre familial, pour faire la même chose, mais importer
 dans un arbre familial temporaire et démarrer une session interactive,
-on peut saisir:
+on peut saisir :
 .INDENT 7.0
 .INDENT 3.5
 \fBgramps \-i\fP \fI\(aqMon Arbre Familial\(aq\fP \fB\-i\fP \fI~/db3.gramps\fP
@@ -302,12 +296,15 @@ besoins
 .UNINDENT
 .sp
 \fBBUGS CONNUS ET LIMITATIONS\fP
+.sp
 \fBFICHIERS\fP
 .INDENT 0.0
 .INDENT 3.5
 \fI${PREFIX}/bin/gramps\fP
 .sp
-\fI${PREFIX}/share/gramps\fP
+\fI${PREFIX}/lib/python/dist\-packages/gramps/\fP
+.sp
+\fI${PREFIX}/share/\fP
 .sp
 \fI${HOME}/.gramps\fP
 .UNINDENT
@@ -336,11 +333,10 @@ La documentation pour développeur est disponible sur le site
 \fI\%http://www.gramps-project.org/wiki/index.php?title=Portal:Developers\fP .
 .UNINDENT
 .sp
-Janvier 2013                         4.0.0                           gramps(1)
+gramps(1)                 @VERSION@               gramps(1)
 .SH AUTHOR
 Jerome Rapinat
 .SH COPYRIGHT
 2012, Gramps project
 .\" Generated by docutils manpage writer.
-.\" 
 .

data/man/gramps.1.in

@@ -300,7 +300,9 @@ or LaTeX to allow the users to modify the format to suit their needs.
 .LP 
 \fI${PREFIX}/bin/gramps\fP
 .br 
-\fI${PREFIX}/share/gramps\fP
+\fI${PREFIX}/lib/python/dist\-packages/gramps/\fP 
+.br 
+\fI${PREFIX}/share/\fP
 .br 
 \fI${HOME}/.gramps\fP 
 

data/man/nl/Makefile.am

@@ -1,15 +0,0 @@
-# This is the data/man/nl level Makefile for Gramps
-# $Id: Makefile.am 9819 2008-01-15 15:42:10Z bmcage $
-
-mandir = @mandir@/nl
-
-man_IN_FILES = gramps.1.in
-man_MANS = $(man_IN_FILES:.1.in=.1)
-
-EXTRA_DIST = $(man_MANS) $(man_IN_FILES)
-
-gramps.1: $(top_builddir)/config.status gramps.1.in
-	cd $(top_builddir) && CONFIG_FILES=data/man/nl/$@ $(SHELL) ./config.status
-
-CLEANFILES=$(man_MANS)
-

data/man/nl/nl.rst

@@ -227,11 +227,14 @@ gramps(1)			     3.4.0			     gramps(1)
 
 
 **GEKENDE BUGS EN BEPERKINGEN**
+
 **BESTANDEN**
 
        *${PREFIX}/bin/gramps*
        
-       *${PREFIX}/share/gramps*
+       *${PREFIX}/lib/python/dist-packages/gramps/*
+       
+       *${PREFIX}/share/*
        
        *${HOME}/.gramps*
 

data/man/pl/Makefile.am

@@ -1,14 +0,0 @@
-# This is the data/man/sv level Makefile for Gramps
-# $Id: Makefile.am 6189 2006-03-21 19:05:46Z rshura $
-
-man_IN_FILES = gramps.1.in
-man_MANS = $(man_IN_FILES:.1.in=.1)
-
-mandir = @mandir@/pl
-
-EXTRA_DIST = $(man_MANS) $(man_IN_FILES)
-
-gramps.1: $(top_builddir)/config.status gramps.1.in
-	cd $(top_builddir) && CONFIG_FILES=data/man/pl/$@ $(SHELL) ./config.status
-
-CLEANFILES=$(man_MANS)

data/man/pl/pl.rst

@@ -276,7 +276,9 @@ gramps(1)			     3.4.0			     gramps(1)
        
        *${PREFIX}/bin/gramps*
        
-       *${PREFIX}/share/gramps*
+       *${PREFIX}/lib/python/dist-packages/gramps/*
+       
+       *${PREFIX}/share/*
        
        *${HOME}/.gramps (jeśli nie użyta została  zmienna  środowiskowa	GRAMP‐
        SHOME)*

data/man/pt_BR/Makefile.am

@@ -1,14 +0,0 @@
-# This is the data/pt_BR level Makefile for Gramps
-# $Id: Makefile.am 16377 2011-01-13 18:32:42Z matlas $
-
-man_IN_FILES = gramps.1.in
-man_MANS = $(man_IN_FILES:.1.in=.1)
-
-mandir = @mandir@/pt_BR
-
-EXTRA_DIST = $(man_MANS) $(man_IN_FILES)
-
-gramps.1: $(top_builddir)/config.status gramps.1.in
-	cd $(top_builddir) && CONFIG_FILES=data/man/pt_BR/$@ $(SHELL) ./config.status
-
-CLEANFILES=$(man_MANS)

data/man/pt_BR/pt_BR.rst

@@ -256,7 +256,9 @@ gramps(1)                4.0.0               gramps(1)
 
        *${PREFIX}/bin/gramps*
        
-       *${PREFIX}/share/gramps*
+       *${PREFIX}/lib/python/dist-packages/gramps/*
+       
+       *${PREFIX}/share/*
        
        *${HOME}/.gramps*
 

data/man/sv/Makefile.am

@@ -1,14 +0,0 @@
-# This is the data/man/sv level Makefile for Gramps
-# $Id: Makefile.am 6189 2006-03-21 19:05:46Z rshura $
-
-man_IN_FILES = gramps.1.in
-man_MANS = $(man_IN_FILES:.1.in=.1)
-
-mandir = @mandir@/sv
-
-EXTRA_DIST = $(man_MANS) $(man_IN_FILES)
-
-gramps.1: $(top_builddir)/config.status gramps.1.in
-	cd $(top_builddir) && CONFIG_FILES=data/man/sv/$@ $(SHELL) ./config.status
-
-CLEANFILES=$(man_MANS)

data/man/sv/sv.rst

@@ -246,7 +246,9 @@ Gramps(1)			     3.4.0			     Gramps(1)
 
        *${PREFIX}/bin/gramps*
        
-       *${PREFIX}/share/gramps*
+       *${PREFIX}/lib/python/dist-packages/gramps/*
+       
+       *${PREFIX}/share/*
        
        *${HOME}/.gramps*
 

gramps/cli/plug/__init__.py

@@ -726,6 +726,7 @@ def cl_book(database, name, book, options_str_dict):
                                 clr.marginr, clr.margint, clr.marginb))
     user = User()
     rptlist = []
+    global_style = None
     for item in book.get_item_list():
 
         # The option values were loaded magically by the book parser.
@@ -743,6 +744,12 @@ def cl_book(database, name, book, options_str_dict):
                               report_class, item.option_class, user)
         style_sheet = create_style_sheet(item)
         rptlist.append((obj, style_sheet))
+        if ( item.name == 'table_of_contents' or
+             item.name == 'alphabetical_index' ): # ugly hack: FIXME
+            if global_style is None:
+                global_style = style_sheet
+            else:
+                global_style = create_style_sheet(item, global_style)
 
     doc.open(clr.option_class.get_output())
     doc.init()
@@ -754,6 +761,8 @@ def cl_book(database, name, book, options_str_dict):
         newpage = 1
         rpt.begin_report()
         rpt.write_report()
+    if global_style:
+        doc.set_style_sheet(global_style)
     doc.close()
 
 #------------------------------------------------------------------------

gramps/data/Makefile.am

@@ -1,21 +0,0 @@
-# This is the src/data level Makefile for gramps
-# $Id$
-#
-SUBDIRS = 
-
-pkgdatadir = $(datadir)/@PACKAGE@/data
-
-dist_pkgdata_DATA = \
-        authors.xml \
-	papersize.xml \
-	tips.xml\
-	lds.xml
-
-# Rules for files with translatable strings
-# These are taken care of by the intltool
-xml_in_files = tips.xml.in
-xml_files = $(xml_in_files:.xml.in=.xml)
-@INTLTOOL_XML_NOMERGE_RULE@
-
-EXTRA_DIST = $(xml_in_files)
-CLEANFILES = $(xml_files)

gramps/gen/config.py

@@ -151,6 +151,7 @@ register('behavior.surname-guessing', 0)
 register('behavior.use-tips', False)
 register('behavior.welcome', 100)
 register('behavior.web-search-url', 'http://google.com/#&q=%(text)s')
+register('behavior.addons-url', "http://svn.code.sf.net/p/gramps-addons/code/branches/gramps40/")
 
 register('export.proxy-order', [
         ["privacy", 0], 
@@ -187,7 +188,7 @@ register('interface.clipboard-height', 300)
 register('interface.clipboard-width', 300)
 register('interface.dont-ask', False)
 register('interface.view-categories',
-         ["Gramplets", "People", "Relationships", "Families", 
+         ["Dashboard", "People", "Relationships", "Families", 
           "Ancestry", "Events", "Places", "Geography", "Sources",
           "Citations", "Repositories", "Media", "Notes"])
 register('interface.edit-filter-width', 500)
@@ -208,6 +209,7 @@ register('interface.filter', False)
 register('interface.filter-editor-width', 400)
 register('interface.filter-editor-height', 350)
 register('interface.fullscreen', False)
+register('interface.grampletbar-close', False)
 register('interface.height', 500)
 register('interface.lds-height', 450)
 register('interface.lds-width', 600)
@@ -278,6 +280,8 @@ register('preferences.date-format', 0)
 register('preferences.calendar-format-report', 0)
 register('preferences.cprefix', 'C%04d')
 register('preferences.default-source', False)
+register('preferences.tag-on-import', False)
+register('preferences.tag-on-import-format', _("Imported %Y/%m/%d %H:%M:%S"))
 register('preferences.eprefix', 'E%04d')
 register('preferences.family-warn', True)
 register('preferences.fprefix', 'F%04d')

gramps/gen/const.py.in

@@ -43,6 +43,7 @@ import uuid
 #
 #-------------------------------------------------------------------------
 from .ggettext import sgettext as _
+from .svn_revision import get_svn_revision
 
 #-------------------------------------------------------------------------
 #
@@ -50,11 +51,20 @@ from .ggettext import sgettext as _
 #
 #-------------------------------------------------------------------------
 PROGRAM_NAME   = "Gramps"
-if "@VERSIONSTRING@" == "@" + "VERSIONSTRING" + "@":
-    VERSION        = "4.0.0"
-else:
-    VERSION        = "@VERSIONSTRING@"
-VERSION_TUPLE  = (4, 0, 0)
+VERSION        = "@VERSIONSTRING@"
+if VERSION == "@" + "VERSIONSTRING" + "@":
+    raise Exception("Please run 'python setup.py build'")
+def get_version_tuple(v):
+    """ Get the numeric-dotted part of version number"""
+    retval = ""
+    for c in v:
+        if c.isdigit() or (c == "." and retval.count(".") <= 1):
+            retval += c
+        else:
+            break
+    return tuple(map(int, retval.split(".")))
+VERSION_TUPLE  = get_version_tuple(VERSION)
+major_version = "%s.%s" % (VERSION_TUPLE[0], VERSION_TUPLE[1])
 
 #-------------------------------------------------------------------------
 #
@@ -65,11 +75,11 @@ URL_HOMEPAGE    = "http://gramps-project.org/"
 URL_MAILINGLIST = "http://sourceforge.net/mail/?group_id=25770"
 URL_BUGTRACKER  = "http://bugs.gramps-project.org/bug_report_advanced_page.php"
 URL_WIKISTRING  = "http://gramps-project.org/wiki/index.php?title="
-URL_MANUAL_PAGE = "Gramps_4.0_Wiki_Manual"
+URL_MANUAL_PAGE = "Gramps_%s_Wiki_Manual" % major_version
 WIKI_FAQ = "FAQ"
-WIKI_KEYBINDINGS = "Gramps_4.0_Wiki_Manual_-_Keybindings"
-WIKI_EXTRAPLUGINS= "4.0_Addons"
-WIKI_EXTRAPLUGINS_RAWDATA = "Plugins4.0&action=raw"
+WIKI_KEYBINDINGS = "Gramps_%s_Wiki_Manual_-_Keybindings" % major_version
+WIKI_EXTRAPLUGINS= "%s_Addons" % major_version
+WIKI_EXTRAPLUGINS_RAWDATA = "Plugins%s&action=raw" % major_version
 
 #-------------------------------------------------------------------------
 #
@@ -84,25 +94,6 @@ APP_GRAMPS_PKG  = "application/x-gramps-package"
 APP_GENEWEB     = "application/x-geneweb"
 APP_VCARD       = ["text/x-vcard", "text/x-vcalendar"]
 
-#-------------------------------------------------------------------------
-#
-# system paths
-#
-#-------------------------------------------------------------------------
-if sys.platform == "win32":
-    if sys.prefix == os.path.dirname(os.getcwd()):
-        PREFIXDIR = sys.prefix
-        SYSCONFDIR = os.path.join(sys.prefix, "etc")
-    else:
-        PREFIXDIR = os.path.join(os.path.dirname(__file__), os.pardir)
-        SYSCONFDIR = os.path.join(PREFIXDIR, "etc")
-elif  sys.platform == "darwin" and sys.prefix != sys.exec_prefix:
-    PREFIXDIR = sys.prefix
-    SYSCONFDIR = os.path.join(sys.prefix, "etc")
-else:
-    PREFIXDIR = "@prefix@"
-    SYSCONFDIR = "@sysconfdir@"
-
 #-------------------------------------------------------------------------
 #
 # Platforms
@@ -145,24 +136,6 @@ if sys.version_info[0] < 3:
 else:
     pass
 
-#-------------------------------------------------------------------------
-#
-# Paths to files - assumes that files reside in the same directory as
-# this one, and that the plugins directory is in a directory below this.
-#
-#-------------------------------------------------------------------------
-ROOT_DIR = os.path.abspath(os.path.join(os.path.dirname(
-            __file__), os.pardir))
-if sys.version_info[0] < 3:
-    # test for sys.frozen to detect a py2exe executable on Windows
-    if hasattr(sys, "frozen"):
-        ROOT_DIR = os.path.abspath(os.path.dirname(
-            unicode(sys.executable, sys.getfilesystemencoding())))
-    else:
-        ROOT_DIR = os.path.abspath(os.path.join(os.path.dirname(
-            unicode(__file__, sys.getfilesystemencoding())), os.pardir))
-
-IMAGE_DIR      = os.path.join(ROOT_DIR, "images")
 VERSION_DIR    = os.path.join(
     HOME_DIR, "gramps%s%s" % (VERSION_TUPLE[0], VERSION_TUPLE[1]))
 
@@ -180,15 +153,28 @@ USER_PLUGINS   = os.path.join(VERSION_DIR, "plugins")
 USER_DIRLIST = (HOME_DIR, VERSION_DIR, ENV_DIR, TEMP_DIR, THUMB_DIR,
                 THUMB_NORMAL, THUMB_LARGE, USER_PLUGINS)
 
-ICON           = os.path.join(ROOT_DIR, "images", "gramps.png")
-LOGO           = os.path.join(ROOT_DIR, "images", "logo.png")
-SPLASH         = os.path.join(ROOT_DIR, "images", "splash.jpg")
-LICENSE_FILE   = os.path.join(ROOT_DIR, "COPYING")
+#-------------------------------------------------------------------------
+#
+# Paths to python modules - assumes that the root directory is one level 
+# above this one, and that the plugins directory is below the root directory.
+#
+#-------------------------------------------------------------------------
+ROOT_DIR = os.path.abspath(os.path.join(os.path.dirname(
+            __file__), os.pardir))
+if sys.version_info[0] < 3:
+    # test for sys.frozen to detect a py2exe executable on Windows
+    if hasattr(sys, "frozen"):
+        ROOT_DIR = os.path.abspath(os.path.dirname(
+            unicode(sys.executable, sys.getfilesystemencoding())))
+    else:
+        ROOT_DIR = os.path.abspath(os.path.join(os.path.dirname(
+            unicode(__file__, sys.getfilesystemencoding())), os.pardir))
+
+#VERSION += get_svn_revision(ROOT_DIR)
 
 #
 # Glade files
 #
-
 GLADE_DIR      = os.path.join(ROOT_DIR, "gui", "glade")
 GLADE_FILE     = os.path.join(GLADE_DIR, "gramps.glade")
 PERSON_GLADE   = os.path.join(GLADE_DIR, "edit_person.glade")
@@ -198,15 +184,10 @@ RULE_GLADE     = os.path.join(GLADE_DIR, "rule.glade")
 
 
 PLUGINS_DIR        = os.path.join(ROOT_DIR, "plugins")
-DATA_DIR           = os.path.join(ROOT_DIR, "data")
 WEB_DIR            = os.path.join(ROOT_DIR, 'webapp')
-#SYSTEM_FILTERS    = os.path.join(DATA_DIR, "system_filters.xml")
-TIP_DATA           = os.path.join(DATA_DIR, "tips.xml")
 WEBSTUFF_DIR       = os.path.join(PLUGINS_DIR, "webstuff")
 WEBSTUFF_IMAGE_DIR = os.path.join(WEBSTUFF_DIR, "images")
 
-PAPERSIZE      = os.path.join(DATA_DIR, "papersize.xml")
-
 USE_TIPS = False
 
 if os.sys.platform in WINDOWS:
@@ -214,13 +195,32 @@ if os.sys.platform in WINDOWS:
 else:
     USE_THUMBNAILER = True
 
+#-------------------------------------------------------------------------
+#
+# Paths to data files.
+#
+#-------------------------------------------------------------------------
+LOCALE_DIR = "@LOCALE_DIR@"
+DATA_DIR = "@DATA_DIR@"
+IMAGE_DIR = "@IMAGE_DIR@"
+DOC_DIR = "@DOC_DIR@"
+
+TIP_DATA = os.path.join(DATA_DIR, "tips.xml")
+PAPERSIZE = os.path.join(DATA_DIR, "papersize.xml")
+
+ICON = os.path.join(IMAGE_DIR, "gramps.png")
+LOGO = os.path.join(IMAGE_DIR, "logo.png")
+SPLASH = os.path.join(IMAGE_DIR, "splash.jpg")
+
+LICENSE_FILE = os.path.join(DOC_DIR, 'COPYING')
+
 #-------------------------------------------------------------------------
 #
 # About box information
 #
 #-------------------------------------------------------------------------
 COPYRIGHT_MSG  = "© 2001-2006 Donald N. Allingham\n" \
-                 "© 2007-2012 The Gramps Developers"
+                 "© 2007-2013 The Gramps Developers"
 COMMENTS       = _("Gramps (Genealogical Research and Analysis "
                    "Management Programming System) is a personal "
                    "genealogy program.")
@@ -325,3 +325,29 @@ LONGOPTS = [
 SHORTOPTS = "O:C:i:e:f:a:p:d:c:lLhuv?s"
 
 GRAMPS_UUID =  uuid.UUID('516cd010-5a41-470f-99f8-eb22f1098ad6')
+
+def need_to_update_const():
+    """ Check to see if this file is older than 
+        setup.py or const.py.in """
+    this_file = os.path.join(ROOT_DIR, "gen", "const.py")
+    in_file = os.path.join(ROOT_DIR, "gen", "const.py.in")
+    setup_file = os.path.join(ROOT_DIR, "..", "setup.py")
+
+    if (os.path.exists(this_file) and 
+        os.path.exists(in_file) and 
+        os.path.exists(setup_file)):
+
+        this_file_time = os.path.getmtime(this_file)
+        in_file_time = os.path.getmtime(in_file)
+        setup_file_time = os.path.getmtime(setup_file)
+
+        # Is this file older than others? If so,
+        # need to run setup
+        return (this_file_time < in_file_time or
+                this_file_time < setup_file_time)
+    else:
+        # Can't tell because can't find the files
+        return False
+
+if need_to_update_const():
+    print("Outdated gramps.gen.const; please run 'python setup.py build'")

gramps/gen/constfunc.py

@@ -64,6 +64,13 @@ else:
     STRTYPE = str
     UNITYPE = str
 cuni = conv_to_unicode_direct
+
+# handle in database is bytes, while internally Gramps wants unicode for py3
+if sys.version_info[0] < 3:
+    handle2internal = lambda x: x
+else:
+    handle2internal = lambda x: conv_to_unicode(x, 'utf-8')
+
 #-------------------------------------------------------------------------
 #
 # Platform determination functions

gramps/gen/db/read.py

@@ -102,6 +102,17 @@ DBERRS      = (db.DBRunRecoveryError, db.DBAccessError,
 # Helper functions
 #
 #-------------------------------------------------------------------------  
+def find_byte_surname(key, data):
+    """
+    Creating a surname from raw data of a person, to use for sort and index
+    returns a byte string
+    """
+    surn = __index_surname(data[3][5])
+    # in python 3 we work with unicode internally, but need byte function sometimes
+    if isinstance(surn, UNITYPE):
+        return surn.encode('utf-8')
+    return surn
+
 def find_surname(key, data):
     """
     Creating a surname from raw data of a person, to use for sort and index
@@ -127,7 +138,10 @@ def __index_surname(surn_list):
                     NameOriginType.PATRONYMIC, NameOriginType.MATRONYMIC]) ])
     else:
         surn = ""
+    if sys.version_info[0] < 3:
         return surn.encode('utf-8')
+    else:
+        return surn
     
 
 #-------------------------------------------------------------------------
@@ -745,6 +759,7 @@ class DbBsddbRead(DbReadBase, Callback):
         return self.get_from_handle(handle, Tag, self.tag_map)
 
     def __get_obj_from_gramps_id(self, val, tbl, class_, prim_tbl):
+        if isinstance(tbl, dict): return None ## trying to get object too early        
         if isinstance(val, UNITYPE):
             val = val.encode('utf-8')
         try:

gramps/gen/db/undoredo.py

@@ -53,6 +53,7 @@ from ..ggettext import gettext as _
 # Gramps modules
 #
 #-------------------------------------------------------------------------
+from ..constfunc import conv_to_unicode, handle2internal
 from .dbconst import *
 from . import BSDDBTxn
 from ..errors import DbError
@@ -67,6 +68,7 @@ DBERRS      = (db.DBRunRecoveryError, db.DBAccessError,
                
 _SIGBASE = ('person', 'family', 'source', 'event', 'media',
             'place', 'repository', 'reference', 'note', 'tag', 'citation')
+
 #-------------------------------------------------------------------------
 #
 # DbUndo class
@@ -315,7 +317,7 @@ class DbUndo(object):
         """
         try:
             if data is None:
-                emit(signal_root + '-delete', ([handle],))
+                emit(signal_root + '-delete', ([handle2internal(handle)],))
                 db_map.delete(handle, txn=self.txn)
             else:
                 ex_data = db_map.get(handle, txn=self.txn)
@@ -324,7 +326,7 @@ class DbUndo(object):
                 else:
                     signal = signal_root + '-add'
                 db_map.put(handle, data, txn=self.txn)
-                emit(signal, ([handle],))
+                emit(signal, ([handle2internal(handle)],))
 
         except DBERRS as msg:
             self.db._log_error()

gramps/gen/db/upgrade.py

@@ -31,7 +31,7 @@ import logging
 LOG = logging.getLogger(".citation")
 
 from ..ggettext import gettext as _
-from ..constfunc import cuni
+from ..constfunc import cuni, UNITYPE
 
 """
 methods to upgrade a database from version 13 to current version
@@ -144,7 +144,9 @@ def gramps_upgrade_16(self):
                           new_citation_list, note_list, change, tag_list, 
                           private, person_ref_list)
             with BSDDBTxn(self.env, self.person_map) as txn:
-                txn.put(str(handle), new_person)
+                if isinstance(handle, UNITYPE):
+                    handle = handle.encode('utf-8')
+                txn.put(handle, new_person)
         self.update()
 
     LOG.debug("%d persons upgraded with %d citations in %d seconds. " % 
@@ -176,7 +178,9 @@ def gramps_upgrade_16(self):
                      change, date, tag_list, private)
         LOG.debug("      upgrade new_media %s" % [new_media])
         with BSDDBTxn(self.env, self.media_map) as txn:
-            txn.put(str(handle), new_media)
+            if isinstance(handle, UNITYPE):
+                handle = handle.encode('utf-8')
+            txn.put(handle, new_media)
         LOG.debug("      update ref map media %s" % [handle,
                         self.get_object_from_handle(handle) ])
         self.update()
@@ -195,7 +199,7 @@ def gramps_upgrade_16(self):
     start_time = time.time()
     for place_handle in self.place_map.keys():
         place = self.place_map[place_handle]
-        (handle, gramps_id, title, int, lat,
+        (handle, gramps_id, title, longi, lat,
          main_loc, alt_loc, urls, media_list, source_list, note_list,
          change, private) = place
         if source_list:
@@ -208,11 +212,13 @@ def gramps_upgrade_16(self):
                                     self, media_list)
         if source_list or media_list:
             new_place = (handle, gramps_id, title, 
-                         int, lat, main_loc, alt_loc, urls,
+                         longi, lat, main_loc, alt_loc, urls,
                          media_list, new_citation_list, note_list, 
                          change, private)
             with BSDDBTxn(self.env, self.place_map) as txn:
-                txn.put(str(handle), new_place)
+                if isinstance(handle, UNITYPE):
+                    handle = handle.encode('utf-8')
+                txn.put(handle, new_place)
         self.update()
 
     LOG.debug("%d places upgraded with %d citations in %d seconds. " % 
@@ -260,7 +266,9 @@ def gramps_upgrade_16(self):
                           attribute_list, lds_seal_list, new_citation_list, 
                           note_list, change, tag_list, private)
             with BSDDBTxn(self.env, self.family_map) as txn:
-                txn.put(str(handle), new_family)
+                if isinstance(handle, UNITYPE):
+                    handle = handle.encode('utf-8')
+                txn.put(handle, new_family)
         self.update()
 
     LOG.debug("%d familys upgraded with %d citations in %d seconds. " % 
@@ -300,7 +308,9 @@ def gramps_upgrade_16(self):
                          attribute_list, 
                          change, private)
             with BSDDBTxn(self.env, self.event_map) as txn:
-                txn.put(str(handle), new_event)
+                if isinstance(handle, UNITYPE):
+                    handle = handle.encode('utf-8')
+                txn.put(handle, new_event)
         t2 = time.time()
         upgrade_time += t2 - t1
         t3 = time.time()
@@ -332,7 +342,9 @@ def gramps_upgrade_16(self):
             new_repository = (handle, gramps_id, the_type, name, note_list,
                               address_list, urls, change, private)
             with BSDDBTxn(self.env, self.repository_map) as txn:
-                txn.put(str(handle), new_repository)
+                if isinstance(handle, UNITYPE):
+                    handle = handle.encode('utf-8')
+                txn.put(handle, new_repository)
         self.update()
 
     LOG.debug("%d repositorys upgraded with %d citations in %d seconds. " % 
@@ -535,7 +547,9 @@ def convert_source_list_to_citation_list_16(self, source_list):
                         date, page, confidence, ref, note_list, new_media_list,
                         new_data_map, new_change, private)
         with BSDDBTxn(self.env, self.citation_map) as txn:
-            txn.put(str(new_handle), new_citation)
+            if isinstance(new_handle, UNITYPE):
+                new_handle = new_handle.encode('utf-8')
+            txn.put(new_handle, new_citation)
         self.cmap_index += 1
 #        # add backlinks for references from Citation to Source
 #        with BSDDBTxn(self.env) as txn:
@@ -621,7 +635,9 @@ def gramps_upgrade_15(self):
                       )
 
         with BSDDBTxn(self.env, self.person_map) as txn:
-            txn.put(str(handle), new_person)
+            if isinstance(handle, UNITYPE):
+                handle = handle.encode('utf-8')
+            txn.put(handle, new_person)
         self.update()
     #surname is now different, remove secondary index with names
     _db = db.DB(self.env)
@@ -644,7 +660,9 @@ def gramps_upgrade_15(self):
             new_family[13] = []
         new_family = tuple(new_family)
         with BSDDBTxn(self.env, self.family_map) as txn:
-            txn.put(str(handle), new_family)
+            if isinstance(handle, UNITYPE):
+                handle = handle.encode('utf-8')
+            txn.put(handle, new_family)
         self.update()
 
     # ---------------------------------
@@ -661,7 +679,9 @@ def gramps_upgrade_15(self):
             new_note[6] = []
         new_note = tuple(new_note)
         with BSDDBTxn(self.env, self.note_map) as txn:
-            txn.put(str(handle), new_note)
+            if isinstance(handle, UNITYPE):
+                handle = handle.encode('utf-8')
+            txn.put(handle, new_note)
         self.update()
 
     # ---------------------------------
@@ -674,7 +694,9 @@ def gramps_upgrade_15(self):
         new_media[10] = []
         new_media = tuple(new_media)
         with BSDDBTxn(self.env, self.media_map) as txn:
-            txn.put(str(handle), new_media)
+            if isinstance(handle, UNITYPE):
+                handle = handle.encode('utf-8')
+            txn.put(handle, new_media)
         self.update()
 
     # ---------------------------------
@@ -688,7 +710,9 @@ def gramps_upgrade_15(self):
         #new_event[11] = []
         new_event = tuple(new_event)
         with BSDDBTxn(self.env, self.event_map) as txn:
-            txn.put(str(handle), new_event)
+            if isinstance(handle, UNITYPE):
+                handle = handle.encode('utf-8')
+            txn.put(handle, new_event)
         self.update()
 
     # ---------------------------------
@@ -704,7 +728,9 @@ def gramps_upgrade_15(self):
         new_place = new_place[:12] + new_place[13:]
         new_place = tuple(new_place)
         with BSDDBTxn(self.env, self.place_map) as txn:
-            txn.put(str(handle), new_place)
+            if isinstance(handle, UNITYPE):
+                handle = handle.encode('utf-8')
+            txn.put(handle, new_place)
         self.update()
 
     # ---------------------------------
@@ -717,7 +743,9 @@ def gramps_upgrade_15(self):
         new_source = new_source[:11] + new_source[12:]
         new_source = tuple(new_source)
         with BSDDBTxn(self.env, self.source_map) as txn:
-            txn.put(str(handle), new_source)
+            if isinstance(handle, UNITYPE):
+                handle = handle.encode('utf-8')
+            txn.put(handle, new_source)
         self.update()
 
     # ---------------------------------
@@ -731,7 +759,9 @@ def gramps_upgrade_15(self):
         new_repository[5] = list(map(convert_address, new_repository[5]))
         new_repository = tuple(new_repository)
         with BSDDBTxn(self.env, self.repository_map) as txn:
-            txn.put(str(handle), new_repository)
+            if isinstance(handle, UNITYPE):
+                handle = handle.encode('utf-8')
+            txn.put(handle, new_repository)
         self.update()
 
     # Bump up database version. Separate transaction to save metadata.
@@ -753,6 +783,8 @@ def convert_marker(self, marker_field):
             tag.set_name(tag_name)
             tag.set_priority(len(self.tags))
             with BSDDBTxn(self.env, self.tag_map) as txn:
+                if isinstance(handle, UNITYPE):
+                    handle = handle.encode('utf-8')
                 txn.put(handle, tag.serialize())
             self.tags[tag_name] = handle
         return self.tags[tag_name]
@@ -819,7 +851,9 @@ def gramps_upgrade_14(self):
         new_note = (handle, gramps_id, styled_text, format, note_type,
                     change, marker, private)
         with BSDDBTxn(self.env, self.note_map) as txn:
-            txn.put(str(handle), new_note)
+            if isinstance(handle, UNITYPE):
+                handle = handle.encode('utf-8')
+            txn.put(handle, new_note)
         self.update()
 
     # ---------------------------------
@@ -839,7 +873,9 @@ def gramps_upgrade_14(self):
                      description, place, new_source_list, note_list, 
                      new_media_list, new_attribute_list, change,marker,private)
         with BSDDBTxn(self.env, self.event_map) as txn:
-            txn.put(str(handle), new_event)
+            if isinstance(handle, UNITYPE):
+                handle = handle.encode('utf-8')
+            txn.put(handle, new_event)
         self.update()
 
     # ---------------------------------
@@ -921,7 +957,9 @@ def gramps_upgrade_14(self):
                       )
 
         with BSDDBTxn(self.env, self.person_map) as txn:
-            txn.put(str(handle), new_person)
+            if isinstance(handle, UNITYPE):
+                handle = handle.encode('utf-8')
+            txn.put(handle, new_person)
         self.update()
 
     # ---------------------------------
@@ -953,7 +991,9 @@ def gramps_upgrade_14(self):
                       change, marker, private)
 
         with BSDDBTxn(self.env, self.family_map) as txn:
-            txn.put(str(handle), new_family)
+            if isinstance(handle, UNITYPE):
+                handle = handle.encode('utf-8')
+            txn.put(handle, new_family)
         self.update()
 
     # ---------------------------------
@@ -978,7 +1018,9 @@ def gramps_upgrade_14(self):
                           new_address_list, urls, change, marker, private)
 
         with BSDDBTxn(self.env, self.repository_map) as txn:
-            txn.put(str(handle), new_repository)
+            if isinstance(handle, UNITYPE):
+                handle = handle.encode('utf-8')
+            txn.put(handle, new_repository)
         self.update()
 
     # ---------------------------------
@@ -996,7 +1038,9 @@ def gramps_upgrade_14(self):
                      new_date, marker, private)
 
         with BSDDBTxn(self.env, self.media_map) as txn:
-            txn.put(str(handle), new_media)
+            if isinstance(handle, UNITYPE):
+                handle = handle.encode('utf-8')
+            txn.put(handle, new_media)
         self.update()
 
     # ---------------------------------
@@ -1004,17 +1048,19 @@ def gramps_upgrade_14(self):
     # ---------------------------------
     for place_handle in self.place_map.keys():
         place = self.place_map[place_handle]
-        (handle, gramps_id, title, int, lat,
+        (handle, gramps_id, title, longi, lat,
          main_loc, alt_loc, urls, media_list, source_list, note_list,
          change, marker, private) = place
         new_media_list = new_media_list_14(media_list)
         new_source_list = new_source_list_14(source_list)
-        new_place = (handle, gramps_id, title, int, lat,
+        new_place = (handle, gramps_id, title, longi, lat,
                      main_loc, alt_loc, urls, new_media_list, 
                      new_source_list, note_list, change, marker, private) 
 
         with BSDDBTxn(self.env, self.place_map) as txn:
-            txn.put(str(handle), new_place)
+            if isinstance(handle, UNITYPE):
+                handle = handle.encode('utf-8')
+            txn.put(handle, new_place)
         self.update()
 
     # ---------------------------------
@@ -1033,7 +1079,9 @@ def gramps_upgrade_14(self):
                       marker, private)
 
         with BSDDBTxn(self.env, self.source_map) as txn:
-            txn.put(str(handle), new_source)
+            if isinstance(handle, UNITYPE):
+                handle = handle.encode('utf-8')
+            txn.put(handle, new_source)
         self.update()
 
     # Bump up database version. Separate transaction to save metadata.

gramps/gen/db/write.py

@@ -74,13 +74,13 @@ from ..lib.researcher import Researcher
 from . import (DbBsddbRead, DbWriteBase, BSDDBTxn, 
                     DbTxn, BsddbBaseCursor, BsddbDowngradeError, DbVersionError,
                     DbEnvironmentError, DbUpgradeRequiredError, find_surname,
-                    find_surname_name, DbUndoBSDDB as DbUndo)
+                    find_byte_surname, find_surname_name, DbUndoBSDDB as DbUndo)
 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, conv_to_unicode, cuni, UNITYPE
+from ..constfunc import win, conv_to_unicode, cuni, UNITYPE, handle2internal
 
 _LOG = logging.getLogger(DBLOGNAME)
 LOG = logging.getLogger(".citation")
@@ -718,7 +718,7 @@ class DbBsddb(DbBsddbRead, DbWriteBase, UpdateCallback):
         if not self.readonly:
 
             assoc = [
-                (self.person_map, self.surnames,  find_surname),
+                (self.person_map, self.surnames,  find_byte_surname),
                 (self.person_map, self.id_trans,  find_idmap),
                 (self.family_map, self.fid_trans, find_idmap),
                 (self.event_map,  self.eid_trans, find_idmap),
@@ -857,6 +857,7 @@ class DbBsddb(DbBsddbRead, DbWriteBase, UpdateCallback):
     def delete_primary_from_reference_map(self, handle, transaction, txn=None):
         """
         Remove all references to the primary object from the reference_map.
+        handle should be utf-8
         """
         primary_cur = self.get_reference_map_primary_cursor()
 
@@ -875,8 +876,12 @@ class DbBsddb(DbBsddbRead, DbWriteBase, UpdateCallback):
             
             # so we need the second tuple give us a reference that we can
             # combine with the primary_handle to get the main key.
-
+            if sys.version_info[0] < 3:
+                #handle should be in python 2 str
                 main_key = (handle, pickle.loads(data)[1][1])
+            else:
+                #python 3 work internally with unicode
+                main_key = (handle.decode('utf-8'), pickle.loads(data)[1][1])
             
             # The trick is not to remove while inside the cursor,
             # but collect them all and remove after the cursor is closed
@@ -950,7 +955,12 @@ class DbBsddb(DbBsddbRead, DbWriteBase, UpdateCallback):
         the passed transaction.
         """
         if isinstance(key, tuple):
-            #create a string key
+            #create a byte string key, first validity check in python 3!
+            for val in key:
+                if sys.version_info[0] >= 3 and isinstance(val, bytes):
+                    raise DbError(_('An attempt is made to safe a reference key '
+                        'which is partly bytecode, this is not allowed.\n'
+                        'Key is %s') % str(key))
             key = str(key)
         if isinstance(key, UNITYPE):
             key = key.encode('utf-8')
@@ -1895,10 +1905,10 @@ class DbBsddb(DbBsddbRead, DbWriteBase, UpdateCallback):
         """
         if (obj_type, trans_type) in transaction:
             if trans_type == TXNDEL:
-                handles = [handle for handle, data in
+                handles = [handle2internal(handle) for handle, data in
                             transaction[(obj_type, trans_type)]]
             else:
-                handles = [handle for handle, data in
+                handles = [handle2internal(handle) for handle, data in
                             transaction[(obj_type, trans_type)]
                             if (handle, None) not in transaction[(obj_type,
                                                                   TXNDEL)]]

gramps/gen/display/name.py

@@ -54,7 +54,10 @@ Specific symbols for parts of a name are defined:
 #
 #-------------------------------------------------------------------------
 from ..ggettext import sgettext as _
+import sys
 import re
+import logging
+LOG = logging.getLogger(".gramps.gen")
 
 #-------------------------------------------------------------------------
 #
@@ -1047,8 +1050,17 @@ def fn(%s):
         else:
             return p + str + s
     return cleanup_name("%s" %% (%s))""" % (args, new_fmt, ",".join(param))
-        exec(s)
-
+        try:
+            exec(s) in globals(), locals()
             return locals()['fn']
+        except:
+            LOG.error("\n" + 'Wrong name format string %s' % new_fmt
+                       +"\n" + ("ERROR, Edit Name format in Preferences->Display to correct")
+                       +"\n" + _('Wrong name format string %s') % new_fmt
+                       +"\n" + ("ERROR, Edit Name format in Preferences->Display to correct")
+                     )
+            def errfn(*arg):
+                return _("ERROR, Edit Name format in Preferences")
+            return errfn
 
 displayer = NameDisplay()

gramps/gen/filters/_filterlist.py

@@ -111,6 +111,7 @@ class FilterList(object):
                 parser.parse(the_file)
                 the_file.close()
         except (IOError, OSError):
+            print("IO/OSError in _filterlist.py")
             pass
         except SAXParseException:
             print("Parser error")

gramps/gen/filters/rules/_matchesfilterbase.py

@@ -26,13 +26,17 @@
 #
 #-------------------------------------------------------------------------
 from ...ggettext import gettext as _
+import logging
+LOG = logging.getLogger(".filter")
 
 #-------------------------------------------------------------------------
 #
 # GRAMPS modules
 #
 #-------------------------------------------------------------------------
-from .. import CustomFilters
+# we need global variableCustomFilters, so we need to query gramps.gen.filters
+# when we need this variable, not import it at the start!
+import gramps.gen.filters
 from . import Rule
 
 #-------------------------------------------------------------------------
@@ -48,31 +52,36 @@ class MatchesFilterBase(Rule):
     Subclasses need to define the namespace class attribute.
     
     """
-
     labels      = [_('Filter name:')]
     name        = 'Objects matching the <filter>'
     description = "Matches objects matched by the specified filter name"
     category    = _('General filters')
 
     def prepare(self, db):
-        if CustomFilters:
-            filters = CustomFilters.get_filters_dict(self.namespace)
+        if gramps.gen.filters.CustomFilters:
+            filters = gramps.gen.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)
+            else:
+                LOG.warning(_("Can't find filter %s in the defined custom filters")
+                                    % self.list[0])
+        else:
+            LOG.warning(_("Can't find filter %s in the defined custom filters") 
+                                    % self.list[0])
 
     def reset(self):
-        if CustomFilters:
-            filters = CustomFilters.get_filters_dict(self.namespace)
+        if gramps.gen.filters.CustomFilters:
+            filters = gramps.gen.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 CustomFilters:
-            filters = CustomFilters.get_filters_dict(self.namespace)
+        if gramps.gen.filters.CustomFilters:
+            filters = gramps.gen.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 +91,8 @@ class MatchesFilterBase(Rule):
         """
         Return the selected filter or None.
         """
-        if CustomFilters:
-            filters = CustomFilters.get_filters_dict(self.namespace)
+        if gramps.gen.filters.CustomFilters:
+            filters = gramps.gen.filters.CustomFilters.get_filters_dict(self.namespace)
             if self.list[0] in filters:
                 return filters[self.list[0]]
         return None

gramps/gen/filters/rules/family/__init__.py

@@ -60,6 +60,7 @@ from ._childhasnameof import ChildHasNameOf
 from ._childhasidof import ChildHasIdOf
 from ._changedsince import ChangedSince
 from ._hastag import HasTag
+from ._hastwins import HasTwins
 
 editor_rule_list = [
     AllFamilies,
@@ -89,4 +90,5 @@ editor_rule_list = [
     ChildHasIdOf,
     ChangedSince,
     HasTag,
+    HasTwins,
 ]

gramps/gen/filters/rules/family/_hastwins.py

@@ -0,0 +1,64 @@
+#
+# Gramps - a GTK+/GNOME based genealogy program
+#
+# Copyright (C) 2013    Nick Hall
+#
+# 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$
+
+#-------------------------------------------------------------------------
+#
+# Standard Python modules
+#
+#-------------------------------------------------------------------------
+from ....ggettext import gettext as _
+
+#-------------------------------------------------------------------------
+#
+# GRAMPS modules
+#
+#-------------------------------------------------------------------------
+from .. import Rule
+from ....lib.childreftype import ChildRefType
+
+#-------------------------------------------------------------------------
+#
+# HasTwins
+#
+#-------------------------------------------------------------------------
+class HasTwins(Rule):
+    """Rule that checks for a family with twins"""
+
+    name        = _('Families with twins')
+    description = _("Matches families with twins")
+    category    = _('Child filters')
+
+    def apply(self, db, family):
+        date_list = []
+        for childref in family.get_child_ref_list():
+            if int(childref.get_mother_relation()) == ChildRefType.BIRTH:
+                child = db.get_person_from_handle(childref.ref)
+                birthref = child.get_birth_ref()
+                if birthref:
+                    birth = db.get_event_from_handle(birthref.ref)
+                    sortval = birth.get_date_object().get_sort_value()
+                    if sortval != 0:
+                        if sortval in date_list:
+                            return True
+                        else:
+                            date_list.append(sortval)
+        return False

gramps/gen/filters/rules/note/__init__.py

@@ -36,6 +36,7 @@ from ._matchesfilter import MatchesFilter
 from ._hasnote import HasNote
 from ._changedsince import ChangedSince
 from ._hastag import HasTag
+from ._hastype import HasType
 
 editor_rule_list = [
     AllNotes,
@@ -49,4 +50,5 @@ editor_rule_list = [
     MatchesFilter,
     ChangedSince,
     HasTag,
+    HasType,
 ]

gramps/gen/filters/rules/note/_hastype.py

@@ -0,0 +1,57 @@
+#
+# Gramps - a GTK+/GNOME based genealogy program
+#
+# Copyright (C) 2002-2006  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
+#
+
+# $Id$
+
+#-------------------------------------------------------------------------
+#
+# Standard Python modules
+#
+#-------------------------------------------------------------------------
+from ....ggettext import gettext as _
+
+#-------------------------------------------------------------------------
+#
+# Gramps modules
+#
+#-------------------------------------------------------------------------
+from ....lib.notetype import NoteType
+from .. import Rule
+
+#-------------------------------------------------------------------------
+#
+# HasType
+#
+#-------------------------------------------------------------------------
+class HasType(Rule):
+    """Rule that checks for a note of a particular type."""
+
+    labels      = [ _('Note type:') ]
+    name        = _('Notes with the particular type')
+    description = _("Matches notes with the particular type ")
+    category    = _('General filters')
+
+    def apply(self, db, note):
+        if not self.list[0]:
+            return False
+        else:
+            specified_type = NoteType()
+            specified_type.set_from_xml_str(self.list[0])
+            return note.get_type() == specified_type

gramps/gen/lib/notetype.py

@@ -69,6 +69,7 @@ class NoteType(GrampsType):
     REPORT_TEXT = 23    # this is used for notes used for reports
     # indicate a note is html code
     HTML_CODE  = 24
+    TODO = 25
 
     _CUSTOM = CUSTOM
     _DEFAULT = GENERAL
@@ -84,6 +85,7 @@ class NoteType(GrampsType):
         (CITATION,    _('Citation'),    "Citation"),
         (REPORT_TEXT, _("Report"),      "Report"),
         (HTML_CODE,   _("Html code"),   "Html code"),
+        (TODO,        _("To Do"),       "To Do"),
         ]
         
     _DATAMAPIGNORE = [

gramps/gen/mime/__init__.py

@@ -22,11 +22,8 @@
 #
 
 try:
-    from ._gnomemime import get_description, get_type, mime_type_is_defined
-except:
-    try:
     from ._winmime import get_description, get_type, mime_type_is_defined
-    except:
+except:
     from ._pythonmime import get_description, get_type, mime_type_is_defined
 
 def base_type(val):

gramps/gen/mime/_gnomemime.py

@@ -1,71 +0,0 @@
-#
-# Gramps - a GTK+/GNOME based genealogy program
-#
-# Copyright (C) 2000-2006  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
-#
-
-# $Id$
-
-from gi.repository import Gtk
-
-try:
-    from gnomevfs import mime_get_short_list_applications, \
-         mime_get_description, get_mime_type, mime_get_default_application
-except:
-    from gnome.vfs import mime_get_short_list_applications, \
-         mime_get_description, get_mime_type, mime_get_default_application
-    
-from ..ggettext import gettext as _
-
-def get_description(type):
-    """Return the description of the specified mime type."""
-    try:
-        return mime_get_description(type)
-    except:
-        return _("unknown")
-
-def get_type(file):
-    """Return the mime type of the specified file."""
-    try:
-        return get_mime_type(file)
-    except:
-        return _('unknown')
-
-def mime_type_is_defined(type):
-    """
-    Return True if a description for a mime type exists.
-    """
-    try:
-        mime_get_description(type)
-        return True
-    except:
-        return False
- 
- #-------------------------------------------------------------------------
-#
-# private functions
-#
-#-------------------------------------------------------------------------
-def _is_good_command(cmd):
-    """
-    We don't know what to do with certain substitution values.
-    If we find one, skip the command.
-    """
-    for sub in [ "%m", "%i", "%c" ]:
-        if cmd.find(sub) != -1:
-            return False
-    return True

gramps/gen/plug/_gramplet.py

@@ -368,7 +368,7 @@ class Gramplet(object):
         """
         from gi.repository import GObject
         self._pause = True
-        if self._idle_id == 0:
+        if self._idle_id != 0:
             GObject.source_remove(self._idle_id)
             self._idle_id = 0
 

gramps/gen/plug/docgen/graphdoc.py

@@ -37,7 +37,7 @@ import sys
 if sys.version_info[0] < 3:
     from StringIO import StringIO
 else:
-    from io import StringIO
+    from io import BytesIO
 import tempfile
 from subprocess import Popen, PIPE
 import sys
@@ -369,7 +369,10 @@ class GVDocBase(BaseDoc, GVDoc):
         BaseDoc.__init__(self, None, paper_style)
 
         self._filename      = None
+        if sys.version_info[0] < 3:
             self._dot = StringIO()
+        else:
+            self._dot = BytesIO()
         self._paper         = paper_style
         
         get_option_by_name = options.menu.get_option_by_name
@@ -595,7 +598,10 @@ class GVDotDoc(GVDocBase):
         if self._filename[-3:] != ".gv":
             self._filename += ".gv"
 
+        if sys.version_info[0] < 3:
             dotfile = open(self._filename, "w")
+        else:
+            dotfile = open(self._filename, "wb")
         dotfile.write(self._dot.getvalue())
         dotfile.close()
 
@@ -630,7 +636,10 @@ class GVPsDoc(GVDocBase):
 
         # Create a temporary dot file
         (handle, tmp_dot) = tempfile.mkstemp(".gv" )
-        dotfile = os.fdopen(handle,"w")
+        if sys.version_info[0] < 3:
+            dotfile = os.fdopen(handle, "w")
+        else:
+            dotfile = os.fdopen(handle, "wb")
         dotfile.write(self._dot.getvalue())
         dotfile.close()
         
@@ -647,10 +656,13 @@ class GVPsDoc(GVDocBase):
         # See bug tracker issue 2815
         # :cairo does not work with Graphviz 2.26.3 and later See issue 4164
         # Covert filename to str using file system encoding.
+        if sys.version_info[0] < 3:
             fname = self._filename.encode(sys.getfilesystemencoding())
+        else:
+            fname = self._filename
 
         command = 'dot -Tps:cairo -o"%s" "%s"' % (fname, tmp_dot)
-        dotversion = Popen(['dot', '-V'], stderr=PIPE).communicate(input=None)[1]
+        dotversion = str(Popen(['dot', '-V'], stderr=PIPE).communicate(input=None)[1])
         # Problem with dot 2.26.3 and later and multiple pages, which gives "cairo: out of
         # memory" If the :cairo is skipped for these cases it gives acceptable
         # result.
@@ -685,11 +697,17 @@ class GVSvgDoc(GVDocBase):
 
         # Create a temporary dot file
         (handle, tmp_dot) = tempfile.mkstemp(".gv" )
-        dotfile = os.fdopen(handle,"w")
+        if sys.version_info[0] < 3:
+            dotfile = os.fdopen(handle, "w")
+        else:
+            dotfile = os.fdopen(handle, "wb")
         dotfile.write(self._dot.getvalue())
         dotfile.close()
         # Covert filename to str using file system encoding.
+        if sys.version_info[0] < 3:
             fname = self._filename.encode(sys.getfilesystemencoding())
+        else:
+            fname = self._filename
 
         # Generate the SVG file.
         os.system( 'dot -Tsvg -o"%s" "%s"' % (fname, tmp_dot) )
@@ -722,11 +740,17 @@ class GVSvgzDoc(GVDocBase):
 
         # Create a temporary dot file
         (handle, tmp_dot) = tempfile.mkstemp(".gv" )
-        dotfile = os.fdopen(handle,"w")
+        if sys.version_info[0] < 3:
+            dotfile = os.fdopen(handle, "w")
+        else:
+            dotfile = os.fdopen(handle, "wb")
         dotfile.write(self._dot.getvalue())
         dotfile.close()
         # Covert filename to str using file system encoding.
+        if sys.version_info[0] < 3:
             fname = self._filename.encode(sys.getfilesystemencoding())
+        else:
+            fname = self._filename
         
         # Generate the SVGZ file.
         os.system( 'dot -Tsvgz -o"%s" "%s"' % (fname, tmp_dot) )
@@ -759,11 +783,17 @@ class GVPngDoc(GVDocBase):
 
         # Create a temporary dot file
         (handle, tmp_dot) = tempfile.mkstemp(".gv" )
-        dotfile = os.fdopen(handle,"w")
+        if sys.version_info[0] < 3:
+            dotfile = os.fdopen(handle, "w")
+        else:
+            dotfile = os.fdopen(handle, "wb")
         dotfile.write(self._dot.getvalue())
         dotfile.close()
         # Covert filename to str using file system encoding.
+        if sys.version_info[0] < 3:
             fname = self._filename.encode(sys.getfilesystemencoding())
+        else:
+            fname = self._filename
         
         # Generate the PNG file.
         os.system( 'dot -Tpng -o"%s" "%s"' % (fname, tmp_dot) )
@@ -796,11 +826,17 @@ class GVJpegDoc(GVDocBase):
 
         # Create a temporary dot file
         (handle, tmp_dot) = tempfile.mkstemp(".gv" )
-        dotfile = os.fdopen(handle,"w")
+        if sys.version_info[0] < 3:
+            dotfile = os.fdopen(handle, "w")
+        else:
+            dotfile = os.fdopen(handle, "wb")
         dotfile.write(self._dot.getvalue())
         dotfile.close()
         # Covert filename to str using file system encoding.
+        if sys.version_info[0] < 3:
             fname = self._filename.encode(sys.getfilesystemencoding())
+        else:
+            fname = self._filename
         
         # Generate the JPEG file.
         os.system( 'dot -Tjpg -o"%s" "%s"' % (fname, tmp_dot) )
@@ -833,11 +869,17 @@ class GVGifDoc(GVDocBase):
 
         # Create a temporary dot file
         (handle, tmp_dot) = tempfile.mkstemp(".gv" )
-        dotfile = os.fdopen(handle,"w")
+        if sys.version_info[0] < 3:
+            dotfile = os.fdopen(handle, "w")
+        else:
+            dotfile = os.fdopen(handle, "wb")
         dotfile.write(self._dot.getvalue())
         dotfile.close()
         # Covert filename to str using file system encoding.
+        if sys.version_info[0] < 3:
             fname = self._filename.encode(sys.getfilesystemencoding())
+        else:
+            fname = self._filename
         
         # Generate the GIF file.
         os.system( 'dot -Tgif -o"%s" "%s"' % (fname, tmp_dot) )
@@ -873,11 +915,17 @@ class GVPdfGvDoc(GVDocBase):
 
         # Create a temporary dot file
         (handle, tmp_dot) = tempfile.mkstemp(".gv" )
-        dotfile = os.fdopen(handle,"w")
+        if sys.version_info[0] < 3:
+            dotfile = os.fdopen(handle, "w")
+        else:
+            dotfile = os.fdopen(handle, "wb")
         dotfile.write(self._dot.getvalue())
         dotfile.close()
-        # Covert filename to str using file system encoding.
+        # Convert filename to str using file system encoding.
+        if sys.version_info[0] < 3:
             fname = self._filename.encode(sys.getfilesystemencoding())
+        else:
+            fname = self._filename
         
         # Generate the PDF file.
         os.system( 'dot -Tpdf -o"%s" "%s"' % (fname, tmp_dot) )
@@ -908,7 +956,10 @@ class GVPdfGsDoc(GVDocBase):
 
         # Create a temporary dot file
         (handle, tmp_dot) = tempfile.mkstemp(".gv" )
-        dotfile = os.fdopen(handle,"w")
+        if sys.version_info[0] < 3:
+            dotfile = os.fdopen(handle, "w")
+        else:
+            dotfile = os.fdopen(handle, "wb")
         dotfile.write(self._dot.getvalue())
         dotfile.close()
         
@@ -922,7 +973,7 @@ class GVPdfGsDoc(GVDocBase):
         # :cairo does not work with Graphviz 2.26.3 and later See issue 4164
         
         command = 'dot -Tps:cairo -o"%s" "%s"' % ( tmp_ps, tmp_dot )
-        dotversion = Popen(['dot', '-V'], stderr=PIPE).communicate(input=None)[1]
+        dotversion = str(Popen(['dot', '-V'], stderr=PIPE).communicate(input=None)[1])
         # Problem with dot 2.26.3 and later and multiple pages, which gives "cairo: out 
         # of memory". If the :cairo is skipped for these cases it gives 
         # acceptable result.
@@ -936,7 +987,10 @@ class GVPdfGsDoc(GVDocBase):
         height_pt = int( (paper_size.get_height_inches() * 72) + 0.5 )
         
         # Convert to PDF using ghostscript
+        if sys.version_info[0] < 3:
             fname = self._filename.encode(sys.getfilesystemencoding())
+        else:
+            fname = self._filename
         command = '%s -q -sDEVICE=pdfwrite -dNOPAUSE -dDEVICEWIDTHPOINTS=%d' \
                   ' -dDEVICEHEIGHTPOINTS=%d -sOutputFile="%s" "%s" -c quit' \
                   % ( _GS_CMD, width_pt, height_pt, fname, tmp_ps )

gramps/gen/plug/report/_book.py

@@ -448,11 +448,11 @@ class BookParser(handler.ContentHandler):
 # Functions
 #
 #-------------------------------------------------------------------------
-def create_style_sheet(item):
+def create_style_sheet(item, previous_style=None):
     """
-    Create a style sheet for a book item.
+    Create a style sheet for a book item, appending any previous_style.
     """
-    selected_style = StyleSheet()
+    selected_style = StyleSheet(previous_style)
 
     handler = item.option_class.handler
 

gramps/gen/plug/report/_constants.py

@@ -43,14 +43,13 @@ from .. import (CATEGORY_TEXT, CATEGORY_DRAW, CATEGORY_CODE, CATEGORY_WEB,
                 CATEGORY_BOOK, CATEGORY_GRAPHVIZ)
 
 standalone_categories = {
-    CATEGORY_TEXT     : _("Text Reports"),
-    CATEGORY_DRAW     : _("Graphical Reports"),
-    CATEGORY_CODE     : _("Code Generators"),
-    CATEGORY_WEB      : _("Web Pages"),
-    CATEGORY_BOOK     : _("Books"),
-    CATEGORY_GRAPHVIZ : _("Graphs"),
+    CATEGORY_TEXT     : ("RepText", _("Text Reports")),
+    CATEGORY_DRAW     : ("RepGraph", _("Graphical Reports")),
+    CATEGORY_CODE     : ("RepCode", _("Code Generators")),
+    CATEGORY_WEB      : ("RepWeb", _("Web Pages")),
+    CATEGORY_BOOK     : ("RepBook", _("Books")),
+    CATEGORY_GRAPHVIZ : ("Graphs", _("Graphs")),
 }
-
 book_categories = {
     CATEGORY_TEXT : _("Text"),
     CATEGORY_DRAW : _("Graphics"),

gramps/gen/plug/report/_options.py

@@ -908,7 +908,7 @@ class DocOptionHandler(_options.OptionHandler):
         # First we set options_dict values based on the saved options
         options = self.saved_option_list.get_options()
         docgen_names = self.option_list_collection.docgen_names
-        for option_name, option_data in options.iteritems():
+        for option_name, option_data in options.items():
             if ( option_name in self.options_dict and
                  isinstance(option_data, list) and
                  option_data and 

gramps/gen/plug/utils.py

@@ -35,7 +35,7 @@ import os
 if sys.version_info[0] < 3:
     from StringIO import StringIO
 else:
-    from io import StringIO
+    from io import StringIO, BytesIO
 
 #-------------------------------------------------------------------------
 #
@@ -219,7 +219,11 @@ def load_addon_file(path, callback=None):
                 callback(_("Unable to open '%s'") % path)
             return
     try:
-        buffer = StringIO(fp.read())
+        content = fp.read()
+        if sys.version_info[0] < 3:
+            buffer = StringIO(content)
+        else:
+            buffer = BytesIO(content)
     except:
         if callback:
             callback(_("Error in reading '%s'") % path)

gramps/gen/soundex.py

@@ -29,8 +29,10 @@ Provide soundex calculation
 # Standard python modules
 #
 #-------------------------------------------------------------------------
-import string
+import sys
 import unicodedata
+if sys.version_info[0] < 3:
+    import string
 
 #-------------------------------------------------------------------------
 #
@@ -38,8 +40,12 @@ import unicodedata
 #
 #-------------------------------------------------------------------------
 IGNORE = "HW~!@#$%^&*()_+=-`[]\|;:'/?.,<>\" \t\f\v"
-TABLE  = string.maketrans('ABCDEFGIJKLMNOPQRSTUVXYZ', 
+if sys.version_info[0] < 3:
+    TABLE  = string.maketrans('ABCDEFGIJKLMNOPQRSTUVXYZ',
                               '012301202245501262301202')
+else:
+    TABLE  = bytes.maketrans(b'ABCDEFGIJKLMNOPQRSTUVXYZ',
+                             b'012301202245501262301202')
 
 from .constfunc import conv_to_unicode_direct
 
@@ -55,9 +61,14 @@ def soundex(strval):
         conv_to_unicode_direct(strval.upper().strip())).encode('ASCII', 'ignore')
     if not strval:
         return "Z000"
-    strval = strval.encode('iso-8859-1')
+    if sys.version_info[0] < 3:
+        strval = strval.encode('iso-8859-1') # Really?
         str2 = strval[0]
         strval = strval.translate(TABLE, IGNORE)
+    else:
+        strval = strval.decode('ASCII', 'ignore')
+        str2 = strval[0]
+        strval = strval.translate(TABLE)
     if not strval:
         return "Z000"
     prev = strval[0]

gramps/gen/svn_revision.py

@@ -0,0 +1,56 @@
+#
+# Gramps - a GTK+/GNOME based genealogy program
+#
+# Copyright (C) 2012       Doug Blank <doug.blank@gmail.com>
+#
+# 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$
+
+import sys
+import subprocess
+
+if sys.version_info[0] < 3:
+    cuni = unicode
+else:
+    def to_utf8(s):
+        return s.decode("utf-8")
+    cuni = to_utf8
+
+def get_svn_revision(path=""):
+    stdout = ""
+    try:
+        p = subprocess.Popen("svnversion -n \"%s\"" % path, shell=True, 
+                             stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        (stdout, stderr) = p.communicate()
+    except:
+        return "" # subprocess failed
+    # subprocess worked
+    if stdout: # has output
+        stdout = cuni(stdout) # get a proper string
+        if (" " in stdout) or (stdout == "exported"): 
+            # one of svnversion's 1.7 non-version responses:
+            # 'Unversioned directory'
+            # 'Unversioned file'
+            # 'Uncommitted local addition, copy or move'
+            # svnversion's 1.6 non-version response:
+            # 'exported'
+            return ""
+        else:
+            return "-r" + stdout
+    else: # no output from svnversion
+        return ""
+

gramps/gen/updatecallback.py

@@ -35,7 +35,8 @@ from __future__ import division
 #-------------------------------------------------------------------------
 import time
 import collections
-
+import logging
+_LOG = logging.getLogger(".gen")
 #-------------------------------------------------------------------------
 #
 # Callback updater
@@ -71,6 +72,9 @@ class UpdateCallback(object):
 
     def set_total(self, total):
         self.total = total
+        if self.total == 0:
+            _LOG.warning('UpdateCallback with total == 0 created')
+            self.total = 1
 
     def update_empty(self, count=None):
         pass

gramps/gen/utils/alive.py

@@ -101,13 +101,16 @@ class ProbablyAlive(object):
         death_date = None
         birth_date = None
         explain = ""
-        # If the recorded death year is before current year then
-        # things are simple.
+
         if death_ref and death_ref.get_role().is_primary():
             if death_ref:
                 death = self.db.get_event_from_handle(death_ref.ref)
-                if death and death.get_date_object().get_start_date() != Date.EMPTY:
+                if death and death.get_date_object().is_valid():
                     death_date = death.get_date_object()
+                elif death: # has a death event, but it is no valid:
+                    death_date = Today() # before today
+                    death_date.set_modifier(Date.MOD_BEFORE)
+                    explain = _("death event without date")
 
         # Look for Cause Of Death, Burial or Cremation events.
         # These are fairly good indications that someone's not alive.
@@ -117,7 +120,12 @@ class ProbablyAlive(object):
                     ev = self.db.get_event_from_handle(ev_ref.ref)
                     if ev and ev.type.is_death_fallback():
                         death_date = ev.get_date_object()
+                        if death_date.get_start_date().is_valid():
                             explain = _("death-related evidence")
+                        else:
+                            death_date = Today() # before today
+                            death_date.set_modifier(Date.MOD_BEFORE)
+                            explain = _("death-related evidence without date")
 
         # If they were born within X years before current year then
         # assume they are alive (we already know they are not dead).
@@ -226,13 +234,25 @@ class ProbablyAlive(object):
                     if mother_handle == person.handle and father_handle:
                         father = self.db.get_person_from_handle(father_handle)
                         date1, date2, explain, other = self.probably_alive_range(father, is_spouse=True)
-                        if date1 and date2:
-                            return date1, date2, _("a spouse, ") + explain, other
+                        if date1 and date1.get_year() != 0:
+                            return (Date().copy_ymd(date1.get_year() - self.AVG_GENERATION_GAP),
+                                    Date().copy_ymd(date1.get_year() - self.AVG_GENERATION_GAP + self.MAX_AGE_PROB_ALIVE),
+                                    _("a spouse's birth-related date, ") + explain, other)
+                        elif date2 and date2.get_year() != 0:
+                            return (Date().copy_ymd(date2.get_year() + self.AVG_GENERATION_GAP - self.MAX_AGE_PROB_ALIVE),
+                                    Date().copy_ymd(date2.get_year() + self.AVG_GENERATION_GAP),
+                                    _("a spouse's death-related date, ") + explain, other)
                     elif father_handle == person.handle and mother_handle:
                         mother = self.db.get_person_from_handle(mother_handle)
                         date1, date2, explain, other = self.probably_alive_range(mother, is_spouse=True)
-                        if date1 and date2:
-                            return date1, date2, _("a spouse, ") + explain, other
+                        if date1 and date1.get_year() != 0:
+                            return (Date().copy_ymd(date1.get_year() - self.AVG_GENERATION_GAP),
+                                    Date().copy_ymd(date1.get_year() - self.AVG_GENERATION_GAP + self.MAX_AGE_PROB_ALIVE),
+                                    _("a spouse's birth-related date, ") + explain, other)
+                        elif date2 and date2.get_year() != 0:
+                            return (Date().copy_ymd(date2.get_year() + self.AVG_GENERATION_GAP - self.MAX_AGE_PROB_ALIVE),
+                                    Date().copy_ymd(date2.get_year() + self.AVG_GENERATION_GAP),
+                                    _("a spouse's death-related date, ") + explain, other)
                     # Let's check the family events and see if we find something
                     for ref in family.get_event_ref_list():
                         if ref:
@@ -483,7 +503,7 @@ def probably_alive(person, db,
         death += limit # add these years to death
     # Finally, check to see if current_date is between dates
     result = (current_date.match(birth, ">=") and 
-              current_date.match(death, "<="))
+              current_date.match(death, "<<"))
     if return_range:
         return (result, birth, death, explain, relative)
     else:

gramps/gen/utils/cast.py

@@ -31,8 +31,11 @@ Utility functions to cast types
 # Python modules
 #
 #-------------------------------------------------------------------------
+import os
 import locale
 import sys
+import logging
+LOG = logging.getLogger(".")
 
 #-------------------------------------------------------------------------
 #
@@ -42,17 +45,46 @@ import sys
 from ..datehandler import codeset
 from ..constfunc import conv_to_unicode, conv_to_unicode_direct, UNITYPE, STRTYPE
 
-"""
-strxfrm needs it's unicode argument correctly cast before used.
-"""
-if sys.version_info[0] < 3:
+try:
+    import PyICU
+    if os.environ.has_key("LC_COLLATE"):
+        collation = os.environ['LC_COLLATE']
+    else:
+        collation = os.environ["LANG"]
+    language_and_country = collation.rsplit('.', 1)[0]
+    if language_and_country in PyICU.Collator.getAvailableLocales().keys():
+        loc = language_and_country
+    else:
+        language = collation.rsplit('_', 1)[0]
+        if language in PyICU.Collator.getAvailableLocales().keys():
+            LOG.warn(_("Language and country %s not supported by ICU: "
+                       "but language %s is supported and will be used" %
+                       (language_and_country, language)))
+            loc = language
+        else:
+            LOG.warn(_("Neither Language and country %s nor language %s "
+                       "supported by ICU: using en_GB" % 
+                       (language_and_country, language)))
+            loc = "en_GB"
+    
+    collator = PyICU.Collator.createInstance(PyICU.Locale(loc))
+    # on ICU, the functions need to receive unicode
+    conv_unicode_tosrtkey = lambda x: collator.getCollationKey(
+                                        x).getByteArray()
+    conv_str_tosrtkey = lambda x: collator.getCollationKey(
+                                        x.decode("UTF-8")).getByteArray()
+except:
+    """
+    strxfrm needs it's unicode argument correctly cast before used.
+    """
+    if sys.version_info[0] < 3:
         conv_unicode_tosrtkey = lambda x: locale.strxfrm(x.encode(codeset, 'replace'))
-else:
+    else:
         conv_unicode_tosrtkey = lambda x: locale.strxfrm(x)
     
-if codeset == 'UTF-8':
+    if codeset == 'UTF-8':
         conv_str_tosrtkey = lambda x: locale.strxfrm(x)
-else:
+    else:
         conv_str_tosrtkey = lambda x: locale.strxfrm(
                             conv_to_unicode(x,'UTF-8').encode(codeset, 'replace'))
 

gramps/gen/utils/db.py

@@ -558,7 +558,6 @@ def get_referents(handle, db, primary_objects):
     for primary in primary_objects:
         primary_list = [item[1] for item in object_list if item[0] == primary]
         the_lists = the_lists + (primary_list, )
-
     return the_lists
 
 def get_source_referents(source_handle, db):

gramps/gen/utils/docgen/__init__.py

@@ -20,6 +20,6 @@
 
 # $Id$
 
-from .TabbedDoc import TabbedDoc
-from .ODSTab import ODSTab
-from .CSVTab import CSVTab
+from .tabbeddoc import TabbedDoc
+from .odstab import ODSTab
+from .csvtab import CSVTab