8555: Database repair tool always modify all source objects

9003: Locality data in address was not imported
Update Greek translation
2016-11-26 12:54:08 +01:00 · 2015-10-27 09:50:28 +01:00 · 2015-10-05 15:19:43 +02:00 · 2015-04-18 16:14:40 +02:00 · 2015-03-31 10:22:09 -07:00 · 2015-03-19 16:08:11 +01:00
1227 changed files with 970214 additions and 1189049 deletions
@@ -10,11 +10,9 @@ dist/
 data/tips.xml
 gramps/plugins/lib/holidays.xml
 po/.intltool-merge-cache
-docs/_build/

-# Editing
+# Editor
 tags
-*.swp

 # Testing
 test/data
@@ -1,4 +1,3 @@
-#! /usr/bin/env python
 #
 # Gramps - a GTK+/GNOME based genealogy program
 #
@@ -19,6 +18,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 #

+# $Id$
+
 """
 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
@@ -1,189 +1,3 @@
-2015-05-01
-Version 4.1.3, "Thou shalt not count to five", a maintenance release.
-* Fix db upgrade failure
-* GtkDialog mapped without a transient parent
-* [Gedcom} SUBN and SUBM record handling
-* [Gedcom] Import/export round trip causes lost information
-* [Gedcom] Entering a witness to an event such as marriage might be ignored
-* [Gedcom] Gramps can't import estim. date period exported by itself
-* [Gedcom] 1/4 and 1/2 ANSEL characters not supported on importing ANSEL
-* [Gedcom] Importing file containing multibyte UTF-8 characters fails
-* [Gedcom] Import fails for ANSI file under python 3
-* [Gedcom] Failure importing ANSEL encoded gedcom file.
-* [Gedcom] Characters ignored on a Gedcom encoded ANSI (cp1252 West Europe, USA)
-* [Gedcom] NameError in importer
-* [Gedcom] Event address is lost on import, i.e. disconnected from event
-* Crash on geneweb export with python3
-* GuiColorOption missing avail-changed event handler
-* Bad generation of [timeline report] ODT files since 4.0.0
-* Fix bad handle in explanation note for unknown event
-* Fix spurious generation of empty 'Alternative Name' in place.merge()
-* Support creating directories in various scenarios
-* Attempting to add a bookmark causes an error
-* Long series of "unhandled exception" popup boxes while doing a check & repair
-* Crash when trying to link existing place as an enclosing place using P0001 number
-* HTML view fails to load
-* Relationship Graph crashes
-* Python3 needs new_subpixbuf not subpixbuf
-* Regression: running gramps from crontab fails
-* tag_map is not initialized
-* Some labels now fit better on citations sidebar filter
-* Event columns in web narrative are too narrow
-* Problem by start program (launcher)
-* Translation string missing in Not Related tool for help and close button
-* Date format month/year is not well reported at editing time [in Italian]
-* Fix unknown gender relationships handler for the french locale
-* Fix a handle type bug on sidebar filter
-* Tidy up About dialog
-* Cleanup on some man files
-* Convert some remaining unicode literals
-* Fix mac menubar setting
-* Enable python3 to run po/update_po.py
-* Updated translations: cs, de, fr, is, nl
-
-2015-02-28
-Version 4.1.2, "That's no ordinary rabbit", a maintenance release.
-* Error converting python2 utf-8 strings to python3 str when loading data from database
-* Removing a parent place from a place leaves a dangling reference
-* Error during checking the database
-* Stubborn blank space in database won't be removed, fix removing rows in flat list views
-* Database upgrade fails if default media path is not set
-* Error converting database after upgrade to Gramps 4.1.1
-* Error in a single place within the places section
-* Entries from the add-or-choose selector of Place/Source/Media/Note cannot be dragged
-* Enclosing places tab should work like other similar tabs, new place reference editor
-* Association editor refuses dropped persons
-* Error on opening twice an object from clipboard
-* Incorrect spacing in export assistant file chooser
-* New Event types are saved as a disordered list
-* Always display main participants
-* Place titles can now be generated on-the-fly by a place displayer, default is still to use the place title field
-* GEDCOM import of embedded notes attached to media does not work
-* Crash on Ancestry.com .ged import; consistent.
-* Errors handling owner/submitter information in GEDCOM files.
-Only import researcher from GEDCOM or XML if the family tree was originally empty.
-* GEDCOM export does not export media attached to citations.
-* The fanchart view crashes if max generation is set to 1 away.
-* Sidebar Filters do not match placetypes in new placeview, two new filter rules (HasTitle, HasData)
-* Fix bug when family has no parents
-* Fix bad handle in explanation note for unknown event
-* Some labels now fit better on citations sidebar filter
-* Views in Geography should not always use the last option set by the user
-* Request for keyboard-controlled zoom on Geography view
-* Error geography view - Displaying main menu
-* Configure screen needs a file selector to select directory for "offline mode" files
-* Filter panel on geography view displays improperly
-* Detailed descendant report crashes, bibliography (citations)
-* Can't disable box shadow in SVG descendant tree
-* Descendant tree graphical report, syntax error in svg output
-* Regression: Complete Individual report has partially-untranslated output
-* Events Page in Narrative Report not working
-* Gramps freeze after defining a report style with German cm values
-* Various problems with docgen.TextDoc.add_media_object
-* Report event attribute name is not translated
-* Records Gramplet uses wrong text
-* Closing detached gramplet causes python to crash
-* Cannot reduce size of gramplets detached from a gramplet bar
-* Gramplets don't fill window when detached from dashboard
-* ImageMetadata doesn't show metadata
-* typo on GLib call, used by an addon only
-* Fix error setting gramplet tab label
-* Check for active person in session log gramplet
-* Spurious spaces in CLI List Family Trees, tab delimited output.
-Print statements changed to assemble the whole line before output.
-* Gtk3 warning and custom undoableentry widget, see bugzilla_id 644927
-* Warnings: deprecated Gtk properties and errors loading theme icon.
-Fix: database manager dialog is inconsistent for older gtk+3 versions.
-Warnings: deprecated Gtk properties and errors loading theme icon.
-Fix: Error loading theme icon 'gtk-apply'
-* gramps fails to start with gtk+-3.13.3
-* Places in data.gramps are not in the new Place hierarchy
-* Upgrade the version of some dependencies for Mac OS and Windows OS.
-* Keywords entry in gramps.desktop does not work
-* 'Available Gramps Updates for Addons' window not on top
-* Some text not translatable in context menu fancharts
-* Fix for Unit test
-* date inflections in _datehandler.py, update for Ukrainian, Russian, Croatian
-* Better support for Serbian and Turkish locales
-* New translation: Icelandic
-* Re-enable Turkish support after a major review. Thank you Uğur.
-* Updated translations: cs, de, eo, fi, fr, hr, hu, it, nb, nn, ru, sk, sr, sv, uk, zh_CN
-
-2014-10-24
-Version 4.1.1, "MachineThatGoes...Ping!", a maintenance release.
-* Fix custom place types in the place editor
-* Allow place type combobox to receive focus.
-* Store custom place types in the metadata table
-* Fix place type for places without a main location
-* Fix bug adding parent places to a new place
-* Prevent user creating a cycle in the place hierarchy
-* Avoid infinite loop when place cycle encountered
-* Prevent creation of a place cycle when merging
-* Fix error when no place is selected
-* Check that a place has been selected when saving.
-* Use the standard place selection widget to be consistent.
-* Add a new Top Level place through the Place Reference Editor
-* Fix backlinks code in place report
-* Backlinks for places can now also be places as well as events.
-* Fix check and repair tool for empty placerefs
-* Update location utilities to work with proxies
-* Place report does not run
-* Update place details gramplet
-* Locations are now displayed in a new separate gramplet.
-* Add check for empty handle in gramplets
-* Check DB lock on the recent opened trees list
-* Sidebarfilter gramplet does not fit well into People, Events or Media views
-* Fix new event default type considering existing events with *default* role
-* Rebuild secondary indexes after database upgrade
-* Importing gedcom files containing multibyte UTF-8 characters fails
-* Ahnentafel Report did not use Christening Date if no Birth Date
-* [Narweb:] Missing webpage for media under some circumstances
-* Fix narrated web report with gendex option enabled
-* Tweak to "default" CSS choice for the narrated web report
-* Invalid link for Merge citation Help button
-* Fix 'todo' gramplet
-* Fix path when using drag & drop to add media
-* Limit the number of generations displayed in the ancestor gramplet
-* Export of a subset of the tree failed
-* Fix issues in python3, and bytes-string mismatch with ICU
-* Fix url/uri handling with non-ascii characters under linux and mac
-* Fix name format on graphical reports
-* Fix name format on textual reports
-* Better GUI support for embeded custom attributes list on media object
-* Better keys for search under linux shells (.desktop file)
-* 'Unknown' person in detailed ancestor report can not be translated
-* Translations don't show in many labels
-* Ensure python text domain gets the right encoding.
-* Translate some punctuation marks
-* Various fixes around Geography and osmgpsmap
-* Allow gramplets to be displayed in the dashboard only
-* Update FSF address
-* Add Arabic-script, Islamic-date, Thai script, Married Name and more dates examples
-* Fix on czech date handler for calculated and estimated dates
-* Enhance Serbian date handler to handle Cyrillic dates
-* Simplify Canadian Ash Wednesday holiday
-* Re-enable Esperanto support (for non-Windows OS only) after a large review
-* New translation: Serbian
-* Various fixes in German and Czech
-* Updated translations: ar, cs, de, fi, fr, it, sv
-
-2014-06-15
-Version 4.1.0, the "Name go in book", new major release.
-* GEP 006: Better Place handling
-* New Tags support on Event, Place, Repository, Source, and Citation
-* Source/Citation Data becomes Attributes
-* Add optional support for checksum on Media object
-* New place hierarchies model
-* By default, you can choose navigator modes with a drop down.
-* New Place editor
-* Enhanced MediaReference Editor
-* Some debug tools move to new gramplets
-* Full Python 3 support
-* New functions and widgets related to Place and Media selections
-* Enhancements on to_struct()
-* New methods on Date handlers
-* Better support on translation for inflection rules
-
 2014-05-22
 Version 4.0.4, "Not the comfy chair", a maintenance release.
 * Upgrade to db version 17 fails in Python 3 due to use of iteritems
@@ -352,7 +166,7 @@ Version 3.4.4 of Gramps! "The Ministry of Silly Names", a maintenance release.
 * Various updated translations: ca, de, fr, it, nl, pt_BR, ru, sv, uk

 2013-03-19
-Version 3.4.3 of Gramps! "Whenever life gets you down, Mrs. Brown", a maintenance release.
+Version 3.4.3 of Gramps! "'Whenever life gets you down, Mrs. Brown'", a maintenance release.
 * Sorting (both in the main display window, and particularly in Narrative Web output) now uses PyICU (if that module is available). Inclusion of PyICU is 'strongly recommended'. This resolves a number of bugs particularly related to sorting of non-Latin characters, and sorting on MS Windows and Mac OS X. Some changes have been made in Narrative Web to support contractions for alphabetic indices.
 * The automatic Addon checking and download now works once again (the location used in Gramps 3.4.2 and before had been changed, so the the automatic process was no longer working).
 * Import from Pro-Gen has been updated (at last) to take account of the change to Citations (in 3.4.0)
@@ -1,34 +1,67 @@
 $Id$

-UNSTABLE Gramps 4.0.0 Beta2 release.
-
-This is a technology preview to allow distribution packagers (and plugin
-writers) to update their scripts (and plugins). This release is not
-production ready, so only use it for testing!
-
-It is recommended that Gramps 4.0.0 be used with python 2.7 since many
-dependent packages do not yet have python 3 versions.  A determined person
-can probably download their sources and build them, however.
-
-The dependencies for Gramps 4.0.0 are _completely_ different than 3.4 due 
-to the switch to GObject introspection, and the removal of autotools. So 
-only install 4.0.0 if you are certain you can obtain the dependencies, 
-see README and INSTALL. 
-
-For linux, in Ubuntu 12.10 you can install 4.0.0, but you will need to 
-compile and install osmgpsmap manually to have the maps working (see 
-http://www.gramps-project.org/wiki/index.php?title=GEPS_029:_GTK3-GObject_introspection_Conversion#OsmGpsMap_for_Geography ) 
+Gramps 4.0.0, the "The Miracle of Birth", release.

+This is a major release, don't upgrade before verifying your system can run it.
+As one of the very first big ($5.4 million), multi-platform (Linux, 
+Windows, Mac OS X, ...), non-Gnome GTK applications, Gramps makes the 
+jump to GTK 3. At the same time python 2.7 and python 3 are supported, 
+though the last must still be considered experimental. Gramps 4.0 
+further uses distutils for distribution, so the install sequence is changed.
+The Gramps developers have tried to make Gramps 4.0 as identical as 
+possible to 3.4, so no data changes are done, nor are there big interface 
+changes. In other words, a .gramps backup file of version 4.0 will open 
+without problems in Gramps 3.4, giving users the possibility to fully try Gramps 4.0.
+Don't be mistaken though, a huge amount of code is new and changed! 
+In order to bring this release we thank the many developers who helped 
+the GTK support on Mac, Windows and Linux forward. Note however, 
+Gramps 4.0 will only work on a top of a very recent sortware stack. 
+A Windows installer will probably not be available soon. In Linux current 
+distro's don't contain the optional packages in the form Gramps 4.0 needs. 
+All this should make clear you can safely keep using version 3.4 and wait 
+for packagers to catch up. People who cannot upgrade the required components 
+but want to use Gramps 4.0 should use it in Virtualbox.

 Major enhancements in Gramps 4.0.0:

-* GEP 8: code reorganization: http://www.gramps-project.org/wiki/index.php?title=GEPS_008:_File_Organization
+* GEP 8: code reorganization: 
+http://www.gramps-project.org/wiki/index.php?title=GEPS_008:_File_Organization

-* GEP 26: Replace make: http://www.gramps-project.org/wiki/index.php?title=GEPS_026:_Replace_%27make%27_for_Gramps_build
+* GEP 26: Replace make: 
+http://www.gramps-project.org/wiki/index.php?title=GEPS_026:_Replace_%27make%27_for_Gramps_build

-* GEP 29: Gtk 3 :http://www.gramps-project.org/wiki/index.php?title=GEPS_029:_GTK3-GObject_introspection_Conversion
+* GEP 29: Gtk 3: 
+http://www.gramps-project.org/wiki/index.php?title=GEPS_029:_GTK3-GObject_introspection_Conversion

-* GEP 31: Python 3 support: http://www.gramps-project.org/wiki/index.php?title=GEPS_031:_Python_3_support
+* GEP 31: Python 3 support: 
+http://www.gramps-project.org/wiki/index.php?title=GEPS_031:_Python_3_support
+
+* Completely reworked localization handling
+
+Others changes in Gramps 4.0.0:
+
+* The Gramplet view has been renamed Dashboard. This to avoid an overload 
+of the word Gramplet, and to make it more clear to new users what can 
+be expected in this view
+
+* GTK 3 uses new themes, so users not on Gnome must set a nice GTK 3 
+theme to fully appreciate Gramps 4.0. Install a GTK 3 theme and set it. 
+If Gramps looks ugly, you made an error in this step.
+
+* Different sidebar navigators can be installed
+
+* New Ancestor Fan Chart View and Descendant Fan Chart View, which offer 
+a lot of insight in your family tree on a small space. Direct printing 
+is available from these views.
+
+* All wizards are reworked, so the exporter dialog, help and bug report 
+dialog are different from version 3.4, but offer the same functions
+
+* New To Do Gramplets listing all To Do Notes
+
+* More reports support output in a different language than the interface language
+
+* Narrative Web has been reworked to make it more stable.

 More info in the manual 
 http://www.gramps-project.org/wiki/index.php?title=Gramps_4.0_Wiki_Manual_-_What%27s_new%3F
@@ -3,9 +3,10 @@
 <id type="desktop">gramps.desktop</id>
 <licence>CC0</licence>
 <description>
-<_p>Gramps is a genealogy program that is both intuitive for hobbyists and feature-complete for professional genealogists.</_p>
-<_p>It gives you the ability to record the many details of the life of an individual as well as the complex relationships between various people, places and events.</_p>
-<_p>All of your research is kept organized, searchable and as precise as you need it to be.</_p>
+<_p>Gramps is a genealogy program that is both intuitive for hobbyists and feature-complete for professional genealogists.
+It gives you the ability to record the many details of the life of an individual as well as the complex relationships between various people, places and events.
+All of your research is kept organized, searchable and as precise as you need it to be.
+</_p>
 </description>
 <url type="homepage">http://gramps-project.org/</url>
 <screenshots>
@@ -8,6 +8,5 @@ Terminal=false
 Type=Application
 StartupNotify=true
 Categories=GTK;Office;
-_Keywords=Genealogy;Family History;Research;Family Tree;GEDCOM;
 MimeType=application/x-gramps;application/x-gedcom;application/x-gramps-package;application/x-gramps-xml;
 Exec=gramps %F
@@ -5,7 +5,7 @@
 #
 # Copyright (C) 2001       Graham J. Williams
 # Copyright (C) 2000-2007  Donald N. Allingham
-# Copyright (C) 2010-2014  Nick Hall
+# Copyright (C) 2010-2011  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
@@ -25,15 +25,15 @@
 -->

 <!--
-    This is the Document Type Definition file for v1.6.0
+    This is the Document Type Definition file for v1.5.1
    of the GRAMPS XML genealogy data format.
    Please use the following formal public identifier to identify it:

-    "-//GRAMPS//DTD GRAMPS XML V1.6.0//EN"
+    "-//GRAMPS//DTD GRAMPS XML V1.5.1//EN"

    For example:
-        <!DOCTYPE database PUBLIC "-//GRAMPS//DTD GRAMPS XML V1.6.0//EN"
-                "http://gramps-project.org/xml/1.6.0/grampsxml.dtd"
+        <!DOCTYPE database PUBLIC "-//GRAMPS//DTD GRAMPS XML V1.5.1//EN"
+                "http://gramps-project.org/xml/1.5.1/grampsxml.dtd"
                [...]>
 -->

@@ -62,7 +62,7 @@ DATABASE
 <!ELEMENT database (header, name-formats?, tags?, events?, people?, families?,
                    citations?, sources?, places?, objects?, repositories?,
                    notes?, bookmarks?, namemaps?)>
-<!ATTLIST database xmlns CDATA #FIXED "http://gramps-project.org/xml/1.6.0/">
+<!ATTLIST database xmlns CDATA #FIXED "http://gramps-project.org/xml/1.5.1/">


 <!--    ************************************************************
@@ -215,8 +215,7 @@ EVENT
 <!ELEMENT events (event)*>

 <!ELEMENT event (type?, (daterange|datespan|dateval|datestr)?, place?, cause?,
-                 description?, attribute*, noteref*, citationref*, objref*,
-                 tagref*)>
+                 description?, attribute*, noteref*, citationref*, objref*)>
 <!ATTLIST event 
        id        CDATA #IMPLIED
        handle    ID    #REQUIRED
@@ -230,7 +229,7 @@ SOURCES

 <!ELEMENT sources (source)*>
 <!ELEMENT source (stitle?, sauthor?, spubinfo?, sabbrev?,
-                  noteref*, objref*, srcattribute*, reporef*, tagref*)>
+                  noteref*, objref*, data_item*, reporef*)>
 <!ATTLIST source
        id        CDATA #IMPLIED
        handle    ID    #REQUIRED
@@ -248,20 +247,16 @@ PLACES

 <!ELEMENT places (placeobj)*>

-<!ELEMENT placeobj (ptitle?, code?, alt_name*, coord?, placeref*, location*,
-                    objref*, url*, noteref*, citationref*, tagref*)>
+<!ELEMENT placeobj (ptitle?, coord?, location*, objref*, url*, noteref*,
+                    citationref*)>
 <!ATTLIST placeobj
        id        CDATA #IMPLIED
        handle    ID    #REQUIRED
        priv      (0|1) #IMPLIED
        change    CDATA #REQUIRED
-        name      CDATA #REQUIRED
-        type      CDATA #REQUIRED
 >

 <!ELEMENT ptitle (#PCDATA)>
-<!ELEMENT code (#PCDATA)>
-<!ELEMENT alt_name (#PCDATA)>

 <!ELEMENT coord EMPTY>
 <!ATTLIST coord
@@ -301,7 +296,6 @@ OBJECTS
 <!ATTLIST file
        src         CDATA #REQUIRED
        mime        CDATA #REQUIRED
-        checksum    CDATA #IMPLIED
        description CDATA #REQUIRED
 >

@@ -311,7 +305,7 @@ REPOSITORIES

 <!ELEMENT repositories (repository)*>

-<!ELEMENT repository (rname, type, address*, url*, noteref*, tagref*)>
+<!ELEMENT repository (rname, type, address*, url*, noteref*)>
 <!ATTLIST repository
        id        CDATA #IMPLIED
        handle    ID    #REQUIRED
@@ -374,7 +368,7 @@ CITATIONS
 <!ELEMENT citations (citation)*>

 <!ELEMENT citation ((daterange|datespan|dateval|datestr)?, page?, confidence,
-                    noteref*, objref*, srcattribute*, sourceref, tagref*)>
+                    noteref*, objref*, data_item*, sourceref)>
 <!ATTLIST citation
        id        CDATA #IMPLIED
        handle    ID    #REQUIRED
@@ -499,13 +493,6 @@ SHARED ELEMENTS
        value   CDATA   #REQUIRED
 >

-<!ELEMENT srcattribute EMPTY>
-<!ATTLIST srcattribute
-        priv    (0|1)   #IMPLIED
-        type    CDATA   #REQUIRED
-        value   CDATA   #REQUIRED
->
-
 <!ELEMENT place EMPTY>
 <!ATTLIST place hlink IDREF #REQUIRED>

@@ -526,11 +513,6 @@ SHARED ELEMENTS
        priv (0|1)  #IMPLIED
 >

-<!ELEMENT placeref ((daterange|datespan|dateval|datestr)?)>
-<!ATTLIST placeref
-        hlink IDREF #REQUIRED
->
-
 <!ELEMENT region EMPTY>
 <!ATTLIST region
        corner1_x  CDATA #REQUIRED
@@ -4,7 +4,7 @@
 # Gramps - a GTK+/GNOME based genealogy program
 #
 # Copyright (C) 2005-2007  Donald N. Allingham
-# Copyright (C) 2010-2014  Nick Hall
+# Copyright (C) 2010-2011  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
@@ -22,16 +22,17 @@

 # Written by Alex Roitman

+# $Id$
 -->

 <!--
-  This is the RELAX NG schema for the Gramps XML genealogy data format.
+  This is the RELAX NG schema for the GRAMPS XML genealogy data format.
 -->


 <grammar
  datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"  
-  ns="http://gramps-project.org/xml/1.6.0/"
+  ns="http://gramps-project.org/xml/1.5.1/"
  xmlns="http://relaxng.org/ns/structure/1.0">

  <start><element name="database">
@@ -427,9 +428,6 @@
    <zeroOrMore><element name="objref">
        <ref name="objref-content"/>
    </element></zeroOrMore>
-    <zeroOrMore><element name="tagref">
-        <ref name="tagref-content"/>
-    </element></zeroOrMore>
  </define>

  <define name="citation-content">
@@ -443,15 +441,13 @@
    <zeroOrMore><element name="objref">
        <ref name="objref-content"/>
    </element></zeroOrMore>
-    <zeroOrMore><element name="srcattribute">
-        <ref name="srcattribute-content"/>
+    <zeroOrMore><element name="data_item">
+        <attribute name="key"><text/></attribute>
+        <attribute name="value"><text/></attribute>
    </element></zeroOrMore>
    <element name="sourceref">
        <ref name="sourceref-content"/>
    </element>
-    <zeroOrMore><element name="tagref">
-        <ref name="tagref-content"/>
-    </element></zeroOrMore>
  </define>

  <define name="source-content">
@@ -466,31 +462,22 @@
    <zeroOrMore><element name="objref">
        <ref name="objref-content"/>
    </element></zeroOrMore>
-    <zeroOrMore><element name="srcattribute">
-        <ref name="srcattribute-content"/>
+    <zeroOrMore><element name="data_item">
+        <attribute name="key"><text/></attribute>
+        <attribute name="value"><text/></attribute>
    </element></zeroOrMore>
    <zeroOrMore><element name="reporef">
        <ref name="reporef-content"/>
    </element></zeroOrMore>
-    <zeroOrMore><element name="tagref">
-        <ref name="tagref-content"/>
-    </element></zeroOrMore>
  </define>

  <define name="place-content">
    <ref name="primary-object"/>
-    <attribute name="name"><text/></attribute>
-    <attribute name="type"><text/></attribute>
    <optional><element name="ptitle"><text/></element></optional>
-    <optional><element name="code"><text/></element></optional>
-    <zeroOrMore><element name="alt_name"><text/></element></zeroOrMore>
    <optional><element name="coord">
        <attribute name="long"><text/></attribute>
        <attribute name="lat"><text/></attribute>
    </element></optional>
-    <zeroOrMore><element name="placeref">
-        <ref name="placeref-content"/>
-    </element></zeroOrMore>
    <zeroOrMore><element name="location">
        <optional><attribute name="street"><text/></attribute></optional>
        <optional><attribute name="locality"><text/></attribute></optional>
@@ -514,9 +501,6 @@
    <zeroOrMore><element name="citationref">
        <ref name="citationref-content"/>
    </element></zeroOrMore>
-    <zeroOrMore><element name="tagref">
-        <ref name="tagref-content"/>
-    </element></zeroOrMore>
  </define>

  <define name="object-content">
@@ -524,8 +508,7 @@
    <element name="file">
        <attribute name="src"><text/></attribute>
        <attribute name="mime"><text/></attribute>
-        <optional><attribute name="checksum"><text/></attribute></optional>
-        <optional><attribute name="description"><text/></attribute></optional>
+        <attribute name="description"><text/></attribute>
    </element>
    <zeroOrMore><element name="attribute">
        <ref name="attribute-content"/>
@@ -555,9 +538,6 @@
    <zeroOrMore><element name="noteref">
        <ref name="noteref-content"/>
    </element></zeroOrMore>
-    <zeroOrMore><element name="tagref">
-        <ref name="tagref-content"/>
-    </element></zeroOrMore>
  </define>

  <define name="bookmark-content">
@@ -700,14 +680,6 @@
        <ref name="noteref-content"/>
    </element></zeroOrMore>
  </define>
-  
-  <define name="srcattribute-content">
-    <optional><attribute name="priv">
-        <ref name="priv-content"/>
-    </attribute></optional>
-    <attribute name="type"><text/></attribute>
-    <attribute name="value"><text/></attribute>
-  </define>

  <define name="url-content">
      <optional><attribute name="priv">
@@ -772,11 +744,6 @@
    <text/>
  </define>

-  <define name="placeref-content">
-    <attribute name="hlink"><data type="IDREF"/></attribute>
-    <optional><ref name="date-content"/></optional>
-  </define>
-
  <define name="tagref-content">
    <attribute name="hlink"><data type="IDREF"/></attribute>
  </define>
@@ -48,9 +48,9 @@ copyright = u'2012, Gramps project'
 # built documents.
 #
 # The short X.Y version.
-version = '4.1'
+version = '4.0'
 # The full version, including alpha/beta/rc tags.
-release = '4.1.0'
+release = '4.0.0-alpha2'

 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -82,9 +82,9 @@ gramps(1)                @VERSION@               gramps(1)


       **-i** , **--import=** *FILE*
-          Import data from *FILE* . If you haven't specified a database, then
-          an empty database is created for you called Family Tree x
-          (where x is an incrementing number).
+          Import data from *FILE* . If you haven't specified a database then
+          a  temporary database is used; this is deleted when you exit
+          gramps.

          When more than one input file is given, each has to be preceded
          by **-i** flag. The files are imported in the specified order, i.e.
@@ -48,9 +48,9 @@ copyright = u'2012, Gramps project'
 # built documents.
 #
 # The short X.Y version.
-version = '4.1'
+version = '4.0'
 # The full version, including alpha/beta/rc tags.
-release = 'trunk'
+release = '4.0.0-alpha2'

 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -82,8 +82,8 @@ gramps(1)                @VERSION@               gramps(1)

       **-i** , **--import=** *FICHIER*
          Importer des données depuis un *FICHIER* . Si vous n'avez pas
-          spécifié de base de données, alors une base de données vide
-          est utilisée.
+          spécifié de base de données alors une base de données temporaire
+          est utilisée; elle sera effacée quand vous quitterez gramps.

          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
@@ -152,7 +152,7 @@ gramps(1)                @VERSION@               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.
@@ -1,4 +1,4 @@
-.TH "GRAMPS" "1" "09 mars 2015" "4.1" "Gramps"
+.TH "GRAMPS" "1" "28 December 2012" "4.0" "Gramps"
 .SH NAME
 gramps \- Gramps Documentation
 .
@@ -106,8 +106,8 @@ sources, vous devez utiliser l\(aqoption d\(aqimport.
 .TP
 .B \fB\-i\fP , \fB\-\-import=\fP \fIFICHIER\fP
 Importer des données depuis un \fIFICHIER\fP . Si vous n\(aqavez pas
-spécifié de base de données, alors une base de données vide
-est utilisée.
+spécifié de base de données alors une base de données temporaire
+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
@@ -172,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.
@@ -337,6 +337,6 @@ gramps(1)                 @VERSION@               gramps(1)
 .SH AUTHOR
 Jerome Rapinat
 .SH COPYRIGHT
-2015, Gramps project
+2012, Gramps project
 .\" Generated by docutils manpage writer.
 .
@@ -104,7 +104,7 @@ If no action, import or export options are given on the command line then an int

 .TP 
 .BI \-i,\-\^\-import= " FILE"
-Import data from \fIFILE\fR. If you haven't specified a database, then an empty database is created for you called Family Tree x (where x is an incrementing number).
+Import data from \fIFILE\fR. If you haven't specified a database then a temporary database is used; this is deleted when you exit gramps.
 .br

 When more than one input file is given, each has to be preceded by \fB\-i\fR 
@@ -1,10 +1,10 @@
 {% extends "admin/base.html" %}
 {% load i18n %}

-{% block title %}{{ title }} | Adminstration{% endblock %}
+{% block title %}{{ title }} | My New Title{% endblock %}

 {% block branding %}
-<h1 id="site-name">Administration</h1>
+<h1 id="site-name">My new title for the Admin site!</h1>
 {% endblock %}

 {% block nav-global %}
@@ -13,8 +13,9 @@
        .ml {margin:0 10px 10px;display:block;float:left}
    </style>

-    <a href="/" clas="ml">Home</a>  
-    <a href="/admin/" class="ml">Administration home</a>
+    <a href="/" clas="ml">Website home</a>  
+    <a href="/admin/" class="ml">Admin home</a>
+    <a href="/admin/members/invoice/" class="ml">Invoices</a>
    <a href="/admin/auth/user/?is_active__exact=0" class="ml">New Users</a>
    <a href="/admin/auth/user/" class="ml">All Users</a>
    {% endif %}
@@ -390,7 +390,7 @@ function buttonOut(button) {
    <p id="createdate">
      <a href="http://www.gramps-project.org/wiki/index.php?title=Gramps-Connect">Gramps-Connect, version {{gramps_version}}</a>.
    </p>
-    <p id="copyright">&copy; 2009-2013 <a href="http://www.gramps-project.org/">www.gramps-project.org</a> 
+    <p id="copyright">&copy; 2009-2012 <a href="http://www.gramps-project.org/">www.gramps-project.org</a> 
    </p>
    {% endblock %}
   </div>
@@ -73,34 +73,6 @@
 </table>
 </div>
 </div>
-
-{% if user.is_superuser %}
-  {% if action == "edit" %}
-    {% make_button "Cancel" "/event/%s" event.handle args %}
-    <input type="hidden" id="place_return" name="place_return" value=""/>
-    <input type="hidden" name="action" value="save"/>
-    <input type="hidden" name="search" value="{{search}}"/>
-    <input type="hidden" name="page" value="{{page}}"/>
-    <input type="submit" value="Save"/>
-  {% else %}
-    {% ifequal action "add" %}
-      {% make_button "Cancel" "/event/" args %}
-      <input type="hidden" id="place_return" name="place_return" value=""/>
-      <input type="hidden" name="action" value="create"/>
-      <input type="hidden" name="search" value="{{search}}"/>
-      <input type="hidden" name="page" value="{{page}}"/>
-      <input type="submit" value="Create"/>
-    {% else %}
-      <div style="background-color: lightgray; padding: 2px 0px 0px 2px; clear: both;">
-      {% make_button "+Add Event" "/event/add" args %}
-      {% make_button "?Edit Event" "/event/%s/edit" event.handle args %}
-      {% make_button "-Delete Event" "/event/%s/delete" event.handle args %}
-      </div>
-    {% endifequal %}
-  {% endif %}
-{% else %}
-{% endif %}
-
 <!-- Tabs -->

 <div class="ui-tabs ui-widget ui-widget-content ui-corner-all" id="tabs" style="border: none;">
@@ -132,6 +104,32 @@
  </div>
 </div>

+{% if user.is_superuser %}
+  {% if action == "edit" %}
+    {% make_button "Cancel" "/event/%s" event.handle args %}
+    <input type="hidden" id="place_return" name="place_return" value=""/>
+    <input type="hidden" name="action" value="save"/>
+    <input type="hidden" name="search" value="{{search}}"/>
+    <input type="hidden" name="page" value="{{page}}"/>
+    <input type="submit" value="Save"/>
+  {% else %}
+    {% ifequal action "add" %}
+      {% make_button "Cancel" "/event/" args %}
+      <input type="hidden" id="place_return" name="place_return" value=""/>
+      <input type="hidden" name="action" value="create"/>
+      <input type="hidden" name="search" value="{{search}}"/>
+      <input type="hidden" name="page" value="{{page}}"/>
+      <input type="submit" value="Create"/>
+    {% else %}
+      <div style="background-color: lightgray; padding: 2px 0px 0px 2px; clear: both;">
+      {% make_button "+Add Event" "/event/add" args %}
+      {% make_button "?Edit Event" "/event/%s/edit" event.handle args %}
+      {% make_button "-Delete Event" "/event/%s/delete" event.handle args %}
+      </div>
+    {% endifequal %}
+  {% endif %}
+{% else %}
+{% endif %}
 </form>
 {% endblock %}

@@ -131,35 +131,6 @@
 </div>
 </div>

-{% if user.is_superuser %}
-  {% if action == "edit" %}
-    {% make_button "Cancel" "/family/%s" family.handle args %}
-    <input type="hidden" id="father_return" name="father_return" value=""/>
-    <input type="hidden" id="mother_return" name="mother_return" value=""/>
-    <input type="hidden" name="action" value="save"/>
-    <input type="hidden" name="search" value="{{search}}"/>
-    <input type="hidden" name="page" value="{{page}}"/>
-    <input type="submit" value="Save"/>
-  {% else %}
-    {% ifequal action "add" %}
-      {% make_button "Cancel" "/family/" args %}
-      <input type="hidden" id="father_return" name="father_return" value=""/>
-      <input type="hidden" id="mother_return" name="mother_return" value=""/>
-      <input type="hidden" name="action" value="create"/>
-      <input type="hidden" name="search" value="{{search}}"/>
-      <input type="hidden" name="page" value="{{page}}"/>
-      <input type="submit" value="Create"/>
-    {% else %}
-      <div style="background-color: lightgray; padding: 2px 0px 0px 2px; clear: both;">
-      {% make_button "+Add Family" "/family/add" args %}
-      {% make_button "?Edit Family" "/family/%s/edit" family.handle args %}
-      {% make_button "-Delete Family" "/family/%s/delete" family.handle args %}
-      </div>
-    {% endifequal %}
-  {% endif %}
-{% else %}
-{% endif %}
-
 <!-- Tabs -->

 <div class="ui-tabs ui-widget ui-widget-content ui-corner-all" id="tabs" style="border: none;">
@@ -200,6 +171,34 @@
  </div>
 </div>

+{% if user.is_superuser %}
+  {% if action == "edit" %}
+    {% make_button "Cancel" "/family/%s" family.handle args %}
+    <input type="hidden" id="father_return" name="father_return" value=""/>
+    <input type="hidden" id="mother_return" name="mother_return" value=""/>
+    <input type="hidden" name="action" value="save"/>
+    <input type="hidden" name="search" value="{{search}}"/>
+    <input type="hidden" name="page" value="{{page}}"/>
+    <input type="submit" value="Save"/>
+  {% else %}
+    {% ifequal action "add" %}
+      {% make_button "Cancel" "/family/" args %}
+      <input type="hidden" id="father_return" name="father_return" value=""/>
+      <input type="hidden" id="mother_return" name="mother_return" value=""/>
+      <input type="hidden" name="action" value="create"/>
+      <input type="hidden" name="search" value="{{search}}"/>
+      <input type="hidden" name="page" value="{{page}}"/>
+      <input type="submit" value="Create"/>
+    {% else %}
+      <div style="background-color: lightgray; padding: 2px 0px 0px 2px; clear: both;">
+      {% make_button "+Add Family" "/family/add" args %}
+      {% make_button "?Edit Family" "/family/%s/edit" family.handle args %}
+      {% make_button "-Delete Family" "/family/%s/delete" family.handle args %}
+      </div>
+    {% endifequal %}
+  {% endif %}
+{% else %}
+{% endif %}
 </form>
 {% endblock %}

@@ -53,31 +53,6 @@
 </tr>
 </table>

-{% if user.is_superuser %}
-  {% if action == "edit" %}
-    {% make_button "Cancel" "/media/%s" media.handle args %}
-    <input type="hidden" name="action" value="save"/>
-    <input type="hidden" name="search" value="{{search}}"/>
-    <input type="hidden" name="page" value="{{page}}"/>
-    <input type="submit" value="Save"/>
-  {% else %}
-    {% ifequal action "add" %}
-      {% make_button "Cancel" "/media/" args %}
-      <input type="hidden" name="action" value="create"/>
-      <input type="hidden" name="search" value="{{search}}"/>
-      <input type="hidden" name="page" value="{{page}}"/>
-      <input type="submit" value="Create"/>
-    {% else %}
-      <div style="background-color: lightgray; padding: 2px 0px 0px 2px; clear: both;">
-      {% make_button "+Add Media" "/media/add" args %}
-      {% make_button "?Edit Media" "/media/%s/edit" media.handle args %}
-      {% make_button "-Delete Media" "/media/%s/delete" media.handle args %}
-      </div>
-    {% endifequal %}
-  {% endif %}
-{% else %}
-{% endif %}
-
 <!-- Tabs -->

 <div class="ui-tabs ui-widget ui-widget-content ui-corner-all" id="tabs" style="border: none;">
@@ -105,6 +80,30 @@
  </div>
 </div>

+{% if user.is_superuser %}
+  {% if action == "edit" %}
+    {% make_button "Cancel" "/media/%s" media.handle args %}
+    <input type="hidden" name="action" value="save"/>
+    <input type="hidden" name="search" value="{{search}}"/>
+    <input type="hidden" name="page" value="{{page}}"/>
+    <input type="submit" value="Save"/>
+  {% else %}
+    {% ifequal action "add" %}
+      {% make_button "Cancel" "/media/" args %}
+      <input type="hidden" name="action" value="create"/>
+      <input type="hidden" name="search" value="{{search}}"/>
+      <input type="hidden" name="page" value="{{page}}"/>
+      <input type="submit" value="Create"/>
+    {% else %}
+      <div style="background-color: lightgray; padding: 2px 0px 0px 2px; clear: both;">
+      {% make_button "+Add Media" "/media/add" args %}
+      {% make_button "?Edit Media" "/media/%s/edit" media.handle args %}
+      {% make_button "-Delete Media" "/media/%s/delete" media.handle args %}
+      </div>
+    {% endifequal %}
+  {% endif %}
+{% else %}
+{% endif %}
 </form>
 {% endblock %}

@@ -70,6 +70,23 @@
 </tr>
 </table>

+<!-- Tabs -->
+
+<div class="ui-tabs ui-widget ui-widget-content ui-corner-all" id="tabs" style="border: none;">
+  <ul class="ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all">
+    <li class="ui-corner-top ui-state-default"><a class="tab-references" href="#tab-references">Reference</a></li>
+    <li class="ui-corner-top ui-state-default"><a class="tab-history" href="#tab-history">History</a></li>
+  </ul>
+  <div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tab-references" style="background-color: #f4f0ec;"> 
+    {% note_reference_table note user action %}
+  </div>
+  <div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tab-history" style="background-color: #f4f0ec;"> 
+    {% history_table note user action %}
+  </div>
+</div>
+</div>
+</div>
+
 {% if user.is_superuser %}
  {% if action == "edit" %}
    {% make_button "Cancel" "/note/%s" note.handle args %}
@@ -94,24 +111,6 @@
  {% endif %}
 {% else %}
 {% endif %}
-
-<!-- Tabs -->
-
-<div class="ui-tabs ui-widget ui-widget-content ui-corner-all" id="tabs" style="border: none;">
-  <ul class="ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all">
-    <li class="ui-corner-top ui-state-default"><a class="tab-references" href="#tab-references">Reference</a></li>
-    <li class="ui-corner-top ui-state-default"><a class="tab-history" href="#tab-history">History</a></li>
-  </ul>
-  <div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tab-references" style="background-color: #f4f0ec;"> 
-    {% note_reference_table note user action %}
-  </div>
-  <div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tab-history" style="background-color: #f4f0ec;"> 
-    {% history_table note user action %}
-  </div>
-</div>
-</div>
-</div>
-
 </form>
 {% endblock %}

@@ -81,38 +81,6 @@

 </div>
 </div>
-
-{% if logform %}
-  <table>
-    {{logform.as_table}}
-  </table>
-{% endif %}
-
-{% if user.is_superuser %}
-  {% if action == "edit" %}
-    {% make_button "Cancel" "/person/%s" person.handle args %}
-    <input type="hidden" name="action" value="save"/>
-    <input type="hidden" name="search" value="{{search}}"/>
-    <input type="hidden" name="page" value="{{page}}"/>
-    <input type="submit" value="Save"/>
-  {% else %}
-    {% ifequal action "add" %}
-      {% make_button "Cancel" "/person/" args %}
-      <input type="hidden" name="action" value="create"/>
-      <input type="hidden" name="search" value="{{search}}"/>
-      <input type="hidden" name="page" value="{{page}}"/>
-      <input type="submit" value="Create"/>
-    {% else %}
-      <div style="background-color: lightgray; padding: 2px 0px 0px 2px; clear: both;">
-      {% make_button "+Add Person" "/person/add" args %}
-      {% make_button "?Edit Person" "/person/%s/edit" person.handle args %}
-      {% make_button "-Delete Person" "/person/%s/delete" person.handle args %}
-      </div>
-    {% endifequal %}
-  {% endif %}
-{% else %}
-{% endif %}
-
 <!-- Tabs -->

 <div class="ui-tabs ui-widget ui-widget-content ui-corner-all" id="tabs" style="border: none;">
@@ -170,6 +138,36 @@
  </div>
 </div>

+{% if logform %}
+  <table>
+    {{logform.as_table}}
+  </table>
+{% endif %}
+
+{% if user.is_superuser %}
+  {% if action == "edit" %}
+    {% make_button "Cancel" "/person/%s" person.handle args %}
+    <input type="hidden" name="action" value="save"/>
+    <input type="hidden" name="search" value="{{search}}"/>
+    <input type="hidden" name="page" value="{{page}}"/>
+    <input type="submit" value="Save"/>
+  {% else %}
+    {% ifequal action "add" %}
+      {% make_button "Cancel" "/person/" args %}
+      <input type="hidden" name="action" value="create"/>
+      <input type="hidden" name="search" value="{{search}}"/>
+      <input type="hidden" name="page" value="{{page}}"/>
+      <input type="submit" value="Create"/>
+    {% else %}
+      <div style="background-color: lightgray; padding: 2px 0px 0px 2px; clear: both;">
+      {% make_button "+Add Person" "/person/add" args %}
+      {% make_button "?Edit Person" "/person/%s/edit" person.handle args %}
+      {% make_button "-Delete Person" "/person/%s/delete" person.handle args %}
+      </div>
+    {% endifequal %}
+  {% endif %}
+{% else %}
+{% endif %}
 </form>
 {% endblock %}

@@ -44,31 +44,6 @@
 </tr>
 </table>

-{% if user.is_superuser %}
-  {% if action == "edit" %}
-    {% make_button "Cancel" "/repository/%s" repository.handle args %}
-    <input type="hidden" name="action" value="save"/>
-    <input type="hidden" name="search" value="{{search}}"/>
-    <input type="hidden" name="page" value="{{page}}"/>
-    <input type="submit" value="Save"/>
-  {% else %}
-    {% ifequal action "add" %}
-      {% make_button "Cancel" "/repository/" args %}
-      <input type="hidden" name="action" value="create"/>
-      <input type="hidden" name="search" value="{{search}}"/>
-      <input type="hidden" name="page" value="{{page}}"/>
-      <input type="submit" value="Create"/>
-    {% else %}
-      <div style="background-color: lightgray; padding: 2px 0px 0px 2px">
-      {% make_button "+Add Repository" "/repository/add" args %}
-      {% make_button "?Edit Repository" "/repository/%s/edit" repository.handle args %}
-      {% make_button "-Delete Repository" "/repository/%s/delete" repository.handle args %}
-      </div>
-    {% endifequal %}
-  {% endif %}
-{% else %}
-{% endif %}
-
 <!-- Tabs -->

 <div class="ui-tab ui-widget ui-widget-content ui-corner-all" id="tabs" style="border: none;">
@@ -96,6 +71,30 @@
  </div>
 </div>

+{% if user.is_superuser %}
+  {% if action == "edit" %}
+    {% make_button "Cancel" "/repository/%s" repository.handle args %}
+    <input type="hidden" name="action" value="save"/>
+    <input type="hidden" name="search" value="{{search}}"/>
+    <input type="hidden" name="page" value="{{page}}"/>
+    <input type="submit" value="Save"/>
+  {% else %}
+    {% ifequal action "add" %}
+      {% make_button "Cancel" "/repository/" args %}
+      <input type="hidden" name="action" value="create"/>
+      <input type="hidden" name="search" value="{{search}}"/>
+      <input type="hidden" name="page" value="{{page}}"/>
+      <input type="submit" value="Create"/>
+    {% else %}
+      <div style="background-color: lightgray; padding: 2px 0px 0px 2px">
+      {% make_button "+Add Repository" "/repository/add" args %}
+      {% make_button "?Edit Repository" "/repository/%s/edit" repository.handle args %}
+      {% make_button "-Delete Repository" "/repository/%s/delete" repository.handle args %}
+      </div>
+    {% endifequal %}
+  {% endif %}
+{% else %}
+{% endif %}
 </form>
 {% endblock %}

@@ -49,31 +49,6 @@
 </div>
 </div>

-{% if user.is_superuser %}
-  {% if action == "edit" %}
-    {% make_button "Cancel" "/source/%s" source.handle args %}
-    <input type="hidden" name="action" value="save"/>
-    <input type="hidden" name="search" value="{{search}}"/>
-    <input type="hidden" name="page" value="{{page}}"/>
-    <input type="submit" value="Save"/>
-  {% else %}
-    {% ifequal action "add" %}
-      {% make_button "Cancel" "/source/" args %}
-      <input type="hidden" name="action" value="create"/>
-      <input type="hidden" name="search" value="{{search}}"/>
-      <input type="hidden" name="page" value="{{page}}"/>
-      <input type="submit" value="Create"/>
-    {% else %}
-      <div style="background-color: lightgray; padding: 2px 0px 0px 2px; clear: both;">
-      {% make_button "+Add Source" "/source/add" args %}
-      {% make_button "?Edit Source" "/source/%s/edit" source.handle args %}
-      {% make_button "-Delete Source" "/source/%s/delete" source.handle args %}
-      </div>
-    {% endifequal %}
-  {% endif %}
-{% else %}
-{% endif %}
-
 <!-- Tabs -->

 <div class="ui-tabs ui-widget ui-widget-content ui-corner-all" id="tabs" style="border: none;">
@@ -105,5 +80,29 @@
  </div>
 </div>

+{% if user.is_superuser %}
+  {% if action == "edit" %}
+    {% make_button "Cancel" "/source/%s" source.handle args %}
+    <input type="hidden" name="action" value="save"/>
+    <input type="hidden" name="search" value="{{search}}"/>
+    <input type="hidden" name="page" value="{{page}}"/>
+    <input type="submit" value="Save"/>
+  {% else %}
+    {% ifequal action "add" %}
+      {% make_button "Cancel" "/source/" args %}
+      <input type="hidden" name="action" value="create"/>
+      <input type="hidden" name="search" value="{{search}}"/>
+      <input type="hidden" name="page" value="{{page}}"/>
+      <input type="submit" value="Create"/>
+    {% else %}
+      <div style="background-color: lightgray; padding: 2px 0px 0px 2px; clear: both;">
+      {% make_button "+Add Source" "/source/add" args %}
+      {% make_button "?Edit Source" "/source/%s/edit" source.handle args %}
+      {% make_button "-Delete Source" "/source/%s/delete" source.handle args %}
+      </div>
+    {% endifequal %}
+  {% endif %}
+{% else %}
+{% endif %}
 </form>
 {% endblock %}
@@ -42,6 +42,15 @@
 </tr>
 </table>

+<div class="ui-tabs ui-widget ui-widget-content ui-corner-all" id="tabs" style="border: none;">
+  <ul class="ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all">
+    <li class="ui-state-default ui-corner-top ui-tabs-selected ui-state-active"><a class="tab-references" href="#tab-references" style=":hover {color: black;}">Reference</a></li>
+  </ul>
+  <div class="ui-tabs-panel ui-widget-content ui-corner-bottom" id="tab-references" style="background-color: #f4f0ec;"> 
+    {% tag_reference_table tag user action %}
+  </div>
+</div>
+
 {% if user.is_superuser %}
  {% if action == "edit" %}
    {% make_button "Cancel" "/tag/%s" tag.handle args %}
@@ -66,16 +75,6 @@
  {% endif %}
 {% else %}
 {% endif %}
-
-<div class="ui-tabs ui-widget ui-widget-content ui-corner-all" id="tabs" style="border: none;">
-  <ul class="ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all">
-    <li class="ui-state-default ui-corner-top ui-tabs-selected ui-state-active"><a class="tab-references" href="#tab-references" style=":hover {color: black;}">Reference</a></li>
-  </ul>
-  <div class="ui-tabs-panel ui-widget-content ui-corner-bottom" id="tab-references" style="background-color: #f4f0ec;"> 
-    {% tag_reference_table tag user action %}
-  </div>
-</div>
-
 </form>
 {% endblock %}

@@ -89,7 +89,7 @@

 <_tip number="48"><b>Web Family Tree Format</b><br/>Gramps can export data to the Web Family Tree (WFT) format. This format allows a family tree to be displayed online using a single file, instead of many html files.</_tip>

-<_tip number="49"><b>Making a Genealogy Website</b><br/>You can easily export your family tree to a web page. Select the entire database, family lines or selected individuals to a collection of web pages ready for upload to the World Wide Web.</_tip>
+<_tip number="49"><b>Making a Genealogy Website</b><br/>You can easily export your family tree to a web page. Select the entire database, family lines or selected individuals to a collection of web pages ready for upload to the World Wide Web. The Gramps project provides free hosting of websites made with Gramps.</_tip>

 <_tip number="50"><b>Reporting Bugs in Gramps</b><br/>The best way to report a bug in Gramps is to use the Gramps bug tracking system at http://bugs.gramps-project.org</_tip>

@@ -3,7 +3,7 @@

 # You can set these variables from the command line.
 SPHINXOPTS    =
-SPHINXBUILD   = GRAMPS_RESOURCES=$$PWD/.. sphinx-build
+SPHINXBUILD   = sphinx-build
 PAPER         =

 # Internal variables.
@@ -2,7 +2,7 @@
 Code Documentation
 ##################

-*Gramps* provides several general API. The most important is the *gen* module, providing access to all code that can be of interest outside of the Gramps program.
+*GRAMPS* provides several general API. The most important is the *gen* module, providing access to all code that can be of interest outside of the GRAMPS program.

 The :mod:`gen` Module
 =======================
@@ -22,7 +22,7 @@ Contents:
   gen/gen_proxy
   gen/gen_utils

-The Gramps Application
+The GRAMPS Application
 ========================

 Contents:
@@ -32,12 +32,11 @@ Contents:

   corecli/cli
   coregui/gui
-   coregui/gui_widgets
   date
   relationship
   simple

-Useful snippets
+Usefull snippets
 ===================

 Contents:
@@ -41,16 +41,16 @@ master_doc = 'index'

 # General information about the project.
 project = u'Gramps'
-copyright = u'2012, The Gramps Project'
+copyright = u'2013, The Gramps Project'

 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '4.1'
+version = '4.0'
 # The full version, including alpha/beta/rc tags.
-release = '4.0.99-trunk'
+release = '4.0.0'

 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -89,8 +89,6 @@ pygments_style = 'sphinx'
 # A list of ignored prefixes for module index sorting.
 #modindex_common_prefix = []

-# If true, todo entries will be included in the output.
-todo_include_todos = True

 # -- Options for HTML output ---------------------------------------------------

@@ -153,6 +153,23 @@ Filter Editor
   :undoc-members:
   :show-inheritance:

+*****************************
+Gramps Bar
+*****************************
+.. automodule:: gramps.gui.widgets.grampletbar
+.. autoclass::  DetachedWindow
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. autoclass::  GrampletBar
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. autoclass::  TabGramplet
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
 *****************************
 Navigator
 *****************************
@@ -163,7 +180,7 @@ Navigator
   :show-inheritance:

 *****************************
-Plugin Manager
+Plugins Manager
 *****************************
 .. automodule:: gramps.gui.pluginmanager
 .. autoclass::  GuiPluginManager
@@ -198,7 +215,7 @@ Utils
   :show-inheritance:

 *****************************
-View Manager
+Views Manager
 *****************************
 .. automodule:: gramps.gui.viewmanager
 .. autoclass:: ViewManager
@@ -1,433 +0,0 @@
-####################################
-The :mod:`gramps.gui.widgets` Module
-####################################
-
-.. automodule:: gramps.gui.widgets
-
-*****************************
-Basic Entry
-*****************************
-.. automodule:: gramps.gui.widgets.basicentry
-.. autoclass:: BasicEntry
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Buttons
-*****************************
-.. automodule:: gramps.gui.widgets.buttons
-.. autoclass:: IconButton
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: WarnButton
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: SimpleButton
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: PrivacyButton
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Date Entry
-*****************************
-.. automodule:: gramps.gui.widgets.dateentry
-.. autoclass:: DateEntry
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Expand Collapse Arrow
-*****************************
-.. automodule:: gramps.gui.widgets.expandcollapsearrow
-.. autoclass:: ExpandCollapseArrow
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Fanchart
-*****************************
-.. automodule:: gramps.gui.widgets.fanchart
-.. autoclass:: FanChartBaseWidget
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: FanChartWidget
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: FanChartGrampsGUI
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Fanchart Descendant
-*****************************
-.. automodule:: gramps.gui.widgets.fanchartdesc
-.. autoclass:: FanChartDescWidget
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: FanChartDescGrampsGUI
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Gramplet Bar
-*****************************
-.. automodule:: gramps.gui.widgets.grampletbar
-.. autoclass::  DetachedWindow
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass::  GrampletBar
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass::  TabGramplet
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Gramplet Pane
-*****************************
-.. automodule:: gramps.gui.widgets.grampletpane
-.. autoclass:: LinkTag
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: GrampletWindow
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: GuiGramplet
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: GridGramplet
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: GrampletPane
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: Configuration
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Labels
-*****************************
-.. automodule:: gramps.gui.widgets.labels
-.. autoclass:: LinkLabel
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: EditLabel
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: BasicLabel
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: GenderLabel
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: MarkupLabel
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: DualMarkupLabel
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Link Box
-*****************************
-.. automodule:: gramps.gui.widgets.linkbox
-.. autoclass:: LinkBox
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Menu Item
-*****************************
-.. automodule:: gramps.gui.widgets.menuitem
-.. autoclass:: MenuItemWithData
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Monitored Widgets
-*****************************
-.. automodule:: gramps.gui.widgets.monitoredwidgets
-.. autoclass:: MonitoredCheckbox
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: MonitoredEntry
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: MonitoredEntryIndicator
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: MonitoredSpinButton
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: MonitoredText
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: MonitoredType
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: MonitoredDataType
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: MonitoredMenu
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: MonitoredStrMenu
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: MonitoredDate
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: MonitoredComboSelectedEntry
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: MonitoredTagList
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Multi Tree View
-*****************************
-.. automodule:: gramps.gui.widgets.multitreeview
-.. autoclass:: MultiTreeView
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Photo
-*****************************
-.. automodule:: gramps.gui.widgets.photo
-.. autoclass:: Photo
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Progress Dialog
-*****************************
-.. automodule:: gramps.gui.widgets.progressdialog
-.. autoclass:: LongOpStatus
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: ProgressMonitor
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: GtkProgressDialog
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Shortlist ComboEntry
-*****************************
-.. automodule:: gramps.gui.widgets.shortlistcomboentry
-.. autoclass:: ShortlistComboEntry
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Spring Separator
-*****************************
-.. automodule:: gramps.gui.widgets.springseparator
-.. autoclass:: SpringSeparatorToolItem
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: SpringSeparatorAction
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Statusbar
-*****************************
-.. automodule:: gramps.gui.widgets.statusbar
-.. autoclass:: Statusbar
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Styled Text Buffer
-*****************************
-.. automodule:: gramps.gui.widgets.styledtextbuffer
-.. autoclass:: LinkTag
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: GtkSpellState
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: StyledTextBuffer
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Styled Text Editor
-*****************************
-.. automodule:: gramps.gui.widgets.styledtexteditor
-.. autoclass:: StyledTextEditor
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Tool ComboEntry
-*****************************
-.. automodule:: gramps.gui.widgets.toolcomboentry
-.. autoclass:: ToolComboEntry
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Undoable Buffer
-*****************************
-.. automodule:: gramps.gui.widgets.undoablebuffer
-.. autoclass:: Stack
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: UndoableInsert
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: UndoableDelete
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: UndoableBuffer
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Undoable Entry
-*****************************
-.. automodule:: gramps.gui.widgets.undoableentry
-.. autoclass:: UndoableInsertEntry
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: UndoableDeleteEntry
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: UndoableEntry
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Undoable Styled Buffer
-*****************************
-.. automodule:: gramps.gui.widgets.undoablestyledbuffer
-.. autoclass:: UndoableInsertStyled
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: UndoableDeleteStyled
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: UndoableApplyStyle
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: UndoableStyledBuffer
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Validated Combo Entry
-*****************************
-.. automodule:: gramps.gui.widgets.validatedcomboentry
-.. autoclass:: ValidatedComboEntry
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Validated Masked Entry
-*****************************
-.. automodule:: gramps.gui.widgets.validatedmaskedentry
-.. autoclass:: FadeOut
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: MaskedEntry
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. autoclass:: ValidatableMaskedEntry
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Value Action
-*****************************
-.. automodule:: gramps.gui.widgets.valueaction
-.. autoclass:: ValueAction
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-*****************************
-Value Tool Item
-*****************************
-.. automodule:: gramps.gui.widgets.valuetoolitem
-.. autoclass:: ValueToolItem
-   :members:
-   :undoc-members:
-   :show-inheritance:
@@ -10,13 +10,6 @@ DateParser
   :undoc-members:
   :show-inheritance:

-DateStrings
-===========
-.. automodule:: gramps.gen.datehandler._datestrings
-.. autoclass:: DateStrings
-   :members:
-   :show-inheritance:
-
 DateDisplay
 ====================================
 .. automodule:: gramps.gen.datehandler._datedisplay
@@ -24,28 +24,14 @@ AddressBase
   :undoc-members:
   :show-inheritance:

-AttributeRootBase
-====================================
-.. automodule:: gramps.gen.lib.attrbase
-.. autoclass:: AttributeRootBase
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
 AttributeBase
 ====================================
+.. automodule:: gramps.gen.lib.attrbase
 .. autoclass:: AttributeBase
   :members:
   :undoc-members:
   :show-inheritance:

-SrcAttributeBase
-====================================
-.. autoclass:: SrcAttributeBase
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
 CitationBase
 ====================================
 .. automodule:: gramps.gen.lib.citationbase
@@ -54,13 +40,6 @@ CitationBase
   :undoc-members:
   :show-inheritance:
   
-IndirectCitationBase
-====================================
-.. autoclass:: IndirectCitationBase
-   :members:
-   :undoc-members:
-   :show-inheritance:
-   
 DateBase
 ====================================
 .. automodule:: gramps.gen.lib.datebase
@@ -268,13 +247,6 @@ Attribute
   :undoc-members:
   :show-inheritance:

-AttributeRoot
-====================================
-.. autoclass:: AttributeRoot
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
 LdsOrd
 ====================================
 .. automodule:: gramps.gen.lib.ldsord
@@ -351,14 +323,6 @@ PersonRef
   :undoc-members:
   :show-inheritance:

-PlaceRef
-====================================
-.. automodule:: gramps.gen.lib.placeref
-.. autoclass:: PlaceRef
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
 RepoRef
 ====================================
 .. automodule:: gramps.gen.lib.reporef
@@ -368,7 +332,7 @@ RepoRef
   :show-inheritance:
   
 *****************************
-Table objects
+Table object
 *****************************

 Table object
@@ -378,14 +342,6 @@ Table object
   :undoc-members:
   :show-inheritance:

-Tag
-====================================
-.. automodule:: gramps.gen.lib.tag
-.. autoclass:: Tag
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
 *****************************
 Date objects
 *****************************
@@ -530,13 +486,6 @@ NoteType
   :undoc-members:
   :show-inheritance:

-PlaceType
-=========
-.. automodule:: gramps.gen.lib.placetype
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
 RepositoryType
 ==============
 .. automodule:: gramps.gen.lib.repotype
@@ -570,7 +519,7 @@ Privacy
 *****************************

 PrivateSourceNote
-=================
+============

 .. automodule:: gramps.gen.lib.privsrcnote
 .. autoclass:: PrivateSourceNote
@@ -4,12 +4,12 @@ The :mod:`gramps.gen.utils` Module

 .. automodule:: gramps.gen.utils

-**********************************
-Utilities
-**********************************
-
-Callback
+Utils
 ====================================
+.. automodule:: gramps.gen.utils.alive
+   :members:
+   :undoc-members:
+   :show-inheritance:
 .. automodule:: gramps.gen.utils.callback
   :members:
   :undoc-members:
@@ -18,10 +18,7 @@ Callback
   :members:
   :undoc-members:
   :show-inheritance:
-
-Configuration
-====================================
-.. automodule:: gramps.gen.utils.configmanager
+.. automodule:: gramps.gen.utils.cast
   :members:
   :undoc-members:
   :show-inheritance:
@@ -29,10 +26,7 @@ Configuration
   :members:
   :undoc-members:
   :show-inheritance:
-
-Database
-====================================
-.. automodule:: gramps.gen.utils.alive
+.. automodule:: gramps.gen.utils.configmanager
   :members:
   :undoc-members:
   :show-inheritance:
@@ -40,62 +34,45 @@ Database
   :members:
   :undoc-members:
   :show-inheritance:
+.. automodule:: gramps.gen.utils.file
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. automodule:: gramps.gen.utils.grampslocale
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. automodule:: gramps.gen.utils.id
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. automodule:: gramps.gen.utils.image
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. automodule:: gramps.gen.utils.keyword
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. automodule:: gramps.gen.utils.lds
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. automodule:: gramps.gen.utils.maclocale
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. automodule:: gramps.gen.utils.place
+   :members:
+   :undoc-members:
+   :show-inheritance:
+.. automodule:: gramps.gen.utils.string
+   :members:
+   :undoc-members:
+   :show-inheritance:
 .. automodule:: gramps.gen.utils.unknown
   :members:
   :undoc-members:
   :show-inheritance:

-File
-====================================
-.. automodule:: gramps.gen.utils.file
-   :members:
-   :undoc-members:
-   :show-inheritance:

-Image
-====================================
-.. automodule:: gramps.gen.utils.image
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-Locale
-====================================
-.. automodule:: gramps.gen.utils.grampslocale
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. automodule:: gramps.gen.utils.maclocale
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. automodule:: gramps.gen.utils.keyword
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-Place
-====================================
-.. automodule:: gramps.gen.utils.place
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-Other
-====================================
-.. automodule:: gramps.gen.utils.cast
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. automodule:: gramps.gen.utils.id
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. automodule:: gramps.gen.utils.lds
-   :members:
-   :undoc-members:
-   :show-inheritance:
-.. automodule:: gramps.gen.utils.string
-   :members:
-   :undoc-members:
-   :show-inheritance:
@@ -1,7 +0,0 @@
-person,surname,given
-a,"CSV Surname","Given 1"
-b,"CSV Surname","Given 2"
-
-marriage,mother,father
-1,a,b
-
@@ -18,6 +18,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # gen/__init__.py
+# $Id$
+#

 """
 The core gramps module provides the different packages
@@ -17,6 +17,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

+# $Id$
+
 """
 Package init for the cli package.
 """
@@ -25,8 +25,10 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

+# $Id$
+
 """
-Module responsible for handling the command line arguments for Gramps.
+Module responsible for handling the command line arguments for GRAMPS.
 """

 #-------------------------------------------------------------------------
@@ -65,31 +67,24 @@ def _split_options(options_str):
    Split the options for the action.
    
    Rules:
-
-    * Entries in the list of options are separated by commas without
-      spaces between entries
-    * List values must be inclosed in brackets ("[" and "]")
-    * Entries within a list value are separated by commas
-    * Text values (as a value or as entries in a list) do not have to be
-      enclosed in quotes unless they include commas or quotation marks.
-    * Text containing double quotes must be contained in single quotes
-    * Text containing single quotes must be contained in double quotes
-    * Text cannot include both single and double quotes
+        * Entries in the list of options are separated by commas without
+          spaces between entries
+        * List values must be inclosed in brackets ("[" and "]")
+        * Entries within a list value are separated by commas
+        * Text values (as a value or as entries in a list) do not have to be
+          enclosed in quotes unless they include commas or quotation marks.
+        * Text containing double quotes must be contained in single quotes
+        * Text containing single quotes must be contained in double quotes
+        * Text cannot include both single and double quotes
    
    Examples:
-
-    Multiple options specified::
-
-        report -p 'name=ancestor_chart,father_disp=["$n born $b"]'
-
-    Using text with commas and quotes::
-
-        title="This is some text with ,s and 's"
-        title='This is some text with ,s and "s'
-
-    Using a list of text::
-
-        textlist=[row1,row2,"row3 with ' and ,"]
+        * Multiple options specified:
+            report -p 'name=ancestor_chart,father_disp=["$n born $b"]'
+        * Using text with commas and quotes:
+            title="This is some text with ,s and 's"
+            title='This is some text with ,s and "s'
+        * Using a list of text
+            textlist=[row1,row2,"row3 with ' and ,"]
    """
    name = ""
    value = ""
@@ -152,16 +147,20 @@ class ArgHandler(object):
    """
    This class is responsible for the non GUI handling of commands.
    The handler is passed a parser object, sanitizes it, and can execute the 
-    actions requested working on a :class:`.DbState`.
+    actions requested working on a DbState.
    """

    def __init__(self, dbstate, parser, sessionmanager, 
                        errorfunc=None, gui=False):
+        from .user import User
+
        self.dbstate = dbstate
        self.sm = sessionmanager
        self.errorfunc = errorfunc
        self.gui = gui
-        self.user = sessionmanager.user
+        self.user = User(error=self.__error, 
+                auto_accept=parser.auto_accept,
+                quiet=parser.quiet)
        if self.gui:
            self.actions = []
            self.list = False
@@ -234,7 +233,7 @@ class ArgHandler(object):
        else:
            self.__error( _('Error: Input Family Tree "%s" does not exist.\n'
                            "If GEDCOM, Gramps-xml or grdb, use the -i option "
-                            "to import into a Family Tree instead.") % value)
+                            "to import into a family tree instead.") % value)
            sys.exit(0)

    def __handle_import_option(self, value, family_tree_format):
@@ -273,9 +272,8 @@ class ArgHandler(object):
            
    def __handle_export_option(self, value, family_tree_format):
        """
-        Handle the "-e" or "--export" option.
-
-        .. note:: this can only happen in the CLI version.
+        Handle the "-e" or "--export" option.  
+        Note: this can only happen in the CLI version.                    
        """
        if self.gui:
            return
@@ -321,8 +319,8 @@ class ArgHandler(object):
        """
        Attempt to find a database path for the given parameter.
        
-        :returns: The path to a Gramps DB or None if a database can not be
-                  deduced.
+        @return: The path to a Gramps DB
+                 or None if a database can not be deduced.
        """
        # First, check if this is the name of a family tree
        db_path = self.dbman.get_family_tree_path(db_name_or_path)
@@ -345,16 +343,15 @@ class ArgHandler(object):
    #-------------------------------------------------------------------------
    def handle_args_gui(self):
        """
-        Method to handle the arguments that can be given for a GUI session.
-
-        :returns: the filename of the family tree that should be opened if 
-                  user just passed a famtree or a filename.
-                  
-        1. no options: a family tree can be given, if so, this name is tested
-           and returned. If a filename, it is imported in a new db and name of
-           new db returned
-        2. an open and/or import option can have been given, if so, this is
-           handled, and None is returned
+        method to handle the arguments that can be given for a GUI session.
+        Returns the filename of the family tree that should be opened if 
+        user just passed a famtree or a filename
+            1/no options: a family tree can be given, if so, this name is
+                        tested and returned. If a filename, it is imported
+                        in a new db and name of new db returned
+            2/an open and/or import option can have been given, if so, this 
+                is handled, and None is returned
+            
        """
        if self.open_gui:
            # First check if a Gramps database was provided
@@ -365,7 +362,7 @@ class ArgHandler(object):
                # Apparently it is not a database. See if it is a file that
                # can be imported.
                db_path, title = self.dbman.import_new_db(self.open_gui, self.user)
-
+        # Handle the "-l" List Family Trees option.  
            if db_path:
                # Test if not locked or problematic
                if not self.check_db(db_path, self.force_unlock):
@@ -376,6 +373,7 @@ class ArgHandler(object):
                    title = db_path
                recent_files(db_path, title)
                self.open = db_path
+        # Handle the "-L" List Family Trees in detail option.  
                self.__open_action()
            else:
                sys.exit(0)
@@ -392,8 +390,8 @@ class ArgHandler(object):
        Depending on the given arguments, import or open data, launch
        session, write files, and/or perform actions.
        
-        :param: climan: the manager of a CLI session
-        :type: :class:`.CLIManager` object
+        @param: climan: the manager of a CLI session
+        @type: CLIManager object
        """
        # Handle the "-l" List Family Trees option.  
        if self.list:
@@ -415,8 +413,7 @@ class ArgHandler(object):
                print(_("Family Tree \"%s\":") % summary[_("Family Tree")])
                for item in sorted(summary):
                    if item != "Family Tree":
-                        # translators: needed for French, ignore otherwise
-                        print(_("   %s: %s") % (item, summary[item]))
+                        print("   %s: %s" % (item, summary[item]))
            sys.exit(0)
           
        # Handle the "-t" List Family Trees, tab delimited option.  
@@ -471,10 +468,8 @@ class ArgHandler(object):

    def __import_action(self):
        """
-        Take action for all given import files.
-        
-        .. note:: Family trees are not supported.
-
+        Take action for all given import files. Note: Family trees are
+            not supported.
        If a family tree is open, the import happens on top of it. If not
        open, a new family tree is created, and the import done. If this
        is CLI, the created tree is deleted at the end (as some action will
@@ -652,14 +647,8 @@ class ArgHandler(object):
                        category = pdata.category
                        tool_class = eval('mod.' + pdata.toolclass)
                        options_class = eval('mod.' + pdata.optionclass)
-                        tool.cli_tool(
-                                dbstate=self.dbstate, 
-                                name=name, 
-                                category=category, 
-                                tool_class=tool_class,
-                                options_class=options_class, 
-                                options_str_dict=options_str_dict,
-                                user=self.user)
+                        tool.cli_tool(self.dbstate, name, category, tool_class,
+                                      options_class, options_str_dict)
                        return
                msg = _("Unknown tool name.")
            else:
@@ -25,8 +25,10 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

+# $Id$
+
 """
-Module responsible for handling the command line arguments for Gramps.
+Module responsible for handling the command line arguments for GRAMPS.
 """

 #-------------------------------------------------------------------------
@@ -131,58 +133,35 @@ class ArgParser(object):
    """
    This class is responsible for parsing the command line arguments (if any)
    given to gramps, and determining if a GUI or a CLI session must be started.
-    A filename and/or options may be specified as arguments.
+    The valid arguments are:

-    The valid options are:
-
-    -O, --open=FAMILY_TREE          Open Family Tree
-    -C, --create=FAMILY_TREE        Create on open if new Family Tree
-    -i, --import=FILENAME           Import file
-    -e, --export=FILENAME           Export file
-    -f, --format=FORMAT             Specify Family Tree format
-    -a, --action=ACTION             Specify action
-    -p, --options=OPTIONS_STRING    Specify options
-    -d, --debug=LOGGER_NAME         Enable debug logs
-    -l                              List Family Trees
-    -L                              List Family Trees in Detail
-    -t                              List Family Trees, tab delimited
-    -u, --force-unlock              Force unlock of Family Tree
-    -s, --show                      Show config settings
-    -c, --config=SETTINGS           Set config setting(s) and start Gramps
-    -y, --yes                       Don't ask to confirm dangerous actions
-    -q, --quiet                     Suppress progress indication output
-    -v, --version                   Show versions
-    -h, --help                      Display the help
-    --usage                         Display usage information
-
-    If the filename (no options) is specified, the interactive session is 
-    launched using data from filename.  In this mode (filename, no options), the 
-    rest of the arguments are ignored.  This is a mode suitable by default for
-    GUI launchers, mime type handlers, and the like.
+    Possible: 
+        1/ FAMTREE : Just the family tree (name or database dir)
+        2/ -O, --open=FAMTREE, Open of a family tree
+        3/ -i, --import=FILE, Import a family tree of any format understood 
+                 by an importer, optionally provide -f to indicate format
+        4/ -e, --export=FILE, export a family tree in required format,
+                 optionally provide -f to indicate format
+        5/ -f, --format=FORMAT : format after a -i or -e option
+        6/ -a, --action: An action (possible: 'report', 'tool')
+        7/ -p, --options=OPTIONS_STRING : specify options
+        8/ -u, --force-unlock: A locked database can be unlocked by giving
+                 this argument when opening it
+    
+    If the filename (no flags) is specified, the interactive session is 
+    launched using data from filename. 
+    In this mode (filename, no flags), the rest of the arguments is ignored.
+    This is a mode suitable by default for GUI launchers, mime type handlers,
+    and the like
    
    If no filename or -i option is given, a new interactive session (empty
    database) is launched, since no data is given anyway.
    
    If -O or -i option is given, but no -e or -a options are given, an
-    interactive session is launched with the ``FILENAME`` (specified with -i). 
+    interactive session is launched with the FILE (specified with -i). 
    
    If both input (-O or -i) and processing (-e or -a) options are given,
-    interactive session will not be launched.
-    
-    When using import ot export options (-i or -e), the -f option may be
-    specified to indicate the family tree format.
-    
-    Possible values for ``ACTION`` are:  'report', 'book' and 'tool'.
-    
-    Configuration ``SETTINGS`` may be specified using the -c option.  The
-    settings are of the form config.setting[:value].  If used without a value,
-    the setting is shown. 
-    
-    If the -y option is given, the user's acceptance of any CLI prompt is 
-    assumed. (see :meth:`.cli.user.User.prompt`)
-    
-    If the -q option is given, extra noise on sys.stderr, such as progress
-    indicators, is suppressed.
+    interactive session will not be launched. 
    """

    def __init__(self, args):
@@ -219,6 +198,25 @@ class ArgParser(object):
        Fill in lists with open, exports, imports, and actions options.

        Any errors are added to self.errors
+        
+        Possible: 
+        1/ Just the family tree (name or database dir)
+        2/ -O --open:   Open of a family tree
+        3/ -i --import: Import a family tree of any format understood by
+                 an importer, optionally provide -f to indicate format
+        4/ -e --export: export a family tree in required format, optionally
+                 provide -f to indicate format
+        5/ -f --format=FORMAT : format after a -i or -e option
+        6/ -a --action: An action (possible: 'report', 'tool')
+        7/ -p --options=OPTIONS_STRING : specify options
+        8/ -u --force-unlock: A locked database can be unlocked by giving
+                 this argument when opening it
+        9/ -s  --show : Show config settings
+        10/ -c --config=config.setting:value : Set config.setting and start
+                 Gramps without :value, the actual config.setting is shown
+        11/ -y --yes: assume user's acceptance of any CLI prompt (see cli.user.User.prompt)
+        12/ -q --quiet: suppress extra noise on sys.stderr, such as progress indicators
+                            
        """
        try:
            # Convert arguments to unicode, otherwise getopt will not work
@@ -324,11 +322,9 @@ class ArgParser(object):
                        set_value = True
                    if config.has_default(setting_name):
                        setting_value = config.get(setting_name)
-                        print(_("Current Gramps config setting: "
-                                "%(name)s:%(value)s")
-                                    % {'name' : setting_name,
-                                       'value' : repr(setting_value)},
-                              file=sys.stderr)
+                        print(_("Current Gramps config setting: %s:%s")
+                                      % (setting_name, repr(setting_value)),
+                                      file=sys.stderr)
                        if set_value:
                            # does a user want the default config value?
                            if new_value in ("DEFAULT", _("DEFAULT")):
@@ -338,12 +334,10 @@ class ArgParser(object):
                                new_value = converter(new_value)
                            config.set(setting_name, new_value)
                            # translators: indent "New" to match "Current"
-                            print(_("    New Gramps config setting: "
-                                    "%(name)s:%(value)s") %
-                                        {'name' : setting_name,
-                                         'value' : repr(
-                                                 config.get(setting_name))},
-                                  file=sys.stderr)
+                            print(_("    New Gramps config setting: %s:%s")
+                                          % (setting_name,
+                                             repr(config.get(setting_name))),
+                                          file=sys.stderr)
                        else:
                            need_to_quit = True
                    else:
@@ -20,6 +20,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

+# $Id$
+
 """
 Provide the management of databases from CLI. This includes opening, renaming,
 creating, and deleting of databases.
@@ -133,8 +135,7 @@ class CLIDbManager(object):
            self._populate_cli()

    def empty(self, val):
-        """
-        Callback that does nothing
+        """Callback that does nothing
        """
        pass

@@ -225,8 +226,7 @@ class CLIDbManager(object):
        return summary_list

    def _populate_cli(self):
-        """
-        Get the list of current names in the database dir
+        """ Get the list of current names in the database dir
        """
        # make the default directory if it does not exist
        dbdir = os.path.expanduser(config.get('behavior.database-path'))
@@ -266,8 +266,7 @@ class CLIDbManager(object):
        return None

    def family_tree_list(self):
-        """
-        Return a list of name, dirname of the known family trees
+        """Return a list of name, dirname of the known family trees
        """
        lst = [(x[0], x[1]) for x in self.current_names]
        return lst
@@ -284,7 +283,7 @@ class CLIDbManager(object):
        """
        print(_('Import finished...'))

-    def create_new_db_cli(self, title=None, create_db=True):
+    def create_new_db_cli(self, title=None):
        """
        Create a new database.
        """
@@ -301,10 +300,9 @@ class CLIDbManager(object):
        name_file.write(title)
        name_file.close()

-        if create_db:
-            # write the version number into metadata
-            newdb = DbBsddb()
-            newdb.write_version(new_path)
+        # write the version number into metadata
+        newdb = DbBsddb()
+        newdb.write_version(new_path)

        (tval, last) = time_val(new_path)
        
@@ -324,14 +322,14 @@ class CLIDbManager(object):
        A new database will only be created if an appropriate importer was 
        found.

-        :param filename: a fully-qualified path, filename, and
-                         extension to open.
+        @param filename: a fully-qualified path, filename, and
+        extension to open.

-        :param user: a :class:`.cli.user.User` or :class:`.gui.user.User`
-                     instance for managing user interaction.
+        @param user: a cli.User or gui.User instance for managing user
+        interaction.
        
-        :returns: A tuple of (new_path, name) for the new database
-                  or (None, None) if no import was performed.
+        @return: A tuple of (new_path, name) for the new database
+                 or (None, None) if no import was performed.
        """
        pmgr = BasePluginManager.get_instance()
        # check to see if it isn't a filename directly:
@@ -385,7 +383,7 @@ class CLIDbManager(object):

    def is_locked(self, dbpath):
        """
-        Returns True if there is a lock file in the dirpath
+        returns True if there is a lock file in the dirpath
        """
        if os.path.isfile(os.path.join(dbpath,"lock")):
            return True
@@ -393,7 +391,7 @@ class CLIDbManager(object):

    def needs_recovery(self, dbpath):
        """
-        Returns True if the database in dirpath needs recovery
+        returns True if the database in dirpath needs recovery
        """
        if os.path.isfile(os.path.join(dbpath,"need_recover")):
            return True
@@ -19,11 +19,13 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

+# $Id$
+
 """
 Provides the startcli function, which the main program calls for CLI
-execution of Gramps.
+execution of GRAMPS.

-Provides also two small base classes: :class:`CLIDbLoader`, :class:`CLIManager`
+Provides also two small base classes: CLIDbLoader, CLIManager
 """

 #-------------------------------------------------------------------------
@@ -71,8 +73,8 @@ from gramps.gen.recentfiles import recent_files
 #-------------------------------------------------------------------------
 class CLIDbLoader(object):
    """
-    Base class for Db loading action inside a :class:`.DbState`. Only the
-    minimum is present needed for CLI handling
+    Base class for Db loading action inside a dbstate. Only the minimum is 
+    present needed for CLI handling
    """
    def __init__(self, dbstate):
        self.dbstate = dbstate
@@ -94,11 +96,9 @@ class CLIDbLoader(object):
    def _dberrordialog(self, msg):
        """
        Show a database error. 
-
-        :param msg: an error message
-        :type msg : string
-
-        .. note:: Inherit for GUI action
+        @param: msg : an error message
+        @type: string
+        @note: Inherit for GUI action
        """
        self._errordialog( '', _("Low level database corruption detected") 
            + '\n' +
@@ -208,12 +208,12 @@ class CLIDbLoader(object):

 class CLIManager(object):
    """
-    Sessionmanager for Gramps. This is in effect a reduced :class:`.ViewManager` 
+    Sessionmanager for GRAMPS. This is in effect a reduced viewmanager 
    instance (see gui/viewmanager), suitable for CLI actions. 
    Aim is to manage a dbstate on which to work (load, unload), and interact
    with the plugin session
    """
-    def __init__(self, dbstate, setloader, user):
+    def __init__(self, dbstate, setloader):
        self.dbstate = dbstate
        if setloader:
            self.db_loader = CLIDbLoader(self.dbstate)
@@ -221,7 +221,6 @@ class CLIManager(object):
            self.db_loader = None
        self.file_loaded = False
        self._pmgr = BasePluginManager.get_instance()
-        self.user = user

    def open_activate(self, path):
        """
@@ -324,10 +323,9 @@ class CLIManager(object):

 def startcli(errors, argparser):
    """
-    Starts a cli session of Gramps.
-
-    :param errors: errors already encountered
-    :param argparser: :class:`.ArgParser` instance
+    Starts a cli session of GRAMPS. 
+    errors    : errors already encountered 
+    argparser : ArgParser instance
    """
    if errors:
        #already errors encountered. Show first one on terminal and exit
@@ -347,13 +345,8 @@ def startcli(errors, argparser):
    
    #we need to keep track of the db state
    dbstate = DbState()
-
    #we need a manager for the CLI session
-    from .user import User
-    user=User(auto_accept=argparser.auto_accept,
-            quiet=argparser.quiet)
-    climanager = CLIManager(dbstate, setloader=True, user=user)
-
+    climanager = CLIManager(dbstate, True)
    #load the plugins
    climanager.do_reg_plugins(dbstate, uistate=None)
    # handle the arguments
@@ -25,6 +25,7 @@
 #
 # cli.plug.__init__
 #
+# $Id$


 #-------------------------------------------------------------------------
@@ -690,7 +691,7 @@ def run_report(db, name, **options_str_dict):
       filename in clr.option_class.get_output()
    """
    dbstate = DbState()
-    climanager = CLIManager(dbstate, setloader=False, user=User()) # don't load db
+    climanager = CLIManager(dbstate, False) # don't load db
    climanager.do_reg_plugins(dbstate, None)
    pmgr = BasePluginManager.get_instance()
    cl_list = pmgr.get_reg_reports()
@@ -19,6 +19,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

+# $Id$
+
 """ Unittest for argparser.py """

 from __future__ import print_function
@@ -18,19 +18,17 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

-""" CLI tests for gramps """
+# $Id$

-from __future__ import unicode_literals
+""" CLI tests for gramps """

 import os
 import unittest
 import re
 import io
 import sys
-import subprocess

 from gramps.gen.constfunc import cuni
-from gramps.gen.const import TEMP_DIR

 test_ged = """0 HEAD
 1 SOUR min1r.ged min 1-rec
@@ -51,8 +49,8 @@ if sys.version_info[0] < 3:
 ##

 ddir = os.path.dirname(__file__)
-min1r = os.path.join(ddir, "min1r.ged")
-out_ged = os.path.join(ddir, "test_out.ged")
+min1r = os.path.join(ddir,"min1r.ged")
+out_ged = os.path.join(ddir,"test_out.ged")

 class Test(unittest.TestCase):
    def setUp(self):
@@ -65,8 +63,7 @@ class Test(unittest.TestCase):
    @classmethod
    def setUpClass(cls):
        if not os.path.exists(min1r):
-            with io.open(min1r, "w") as f:
-                f.write(test_ged)
+            open(min1r,"wb").write(test_ged)

    @classmethod
    def tearDownClass(cls):
@@ -86,17 +83,11 @@ class Test(unittest.TestCase):
        ifile = min1r
        ofile = out_ged
        gcmd = "Gramps.py -i %s -e %s" % (ifile, ofile)
-        process = subprocess.Popen("python %s" % gcmd,
-                                   stdin=subprocess.PIPE,
-                                   stdout=subprocess.PIPE,
-                                   stderr=subprocess.PIPE, shell=True)
-        result_str, err_str = process.communicate()
-        self.assertEqual(process.returncode, 0,
-                         "executed CLI command %r" % gcmd)
+        rc = os.system("python %s" % gcmd)
+        self.assertEquals(rc, 0, "executed CLI cmmand %r" % gcmd)
        # simple validation o output
        self.assertTrue(os.path.isfile(ofile), "output file created")
-        with io.open(ofile) as f:
-            content = f.read()
+        content = open(ofile).read()
        g = re.search("INDI", content)
        self.assertTrue(g, "found 'INDI' in output file")

@@ -104,24 +95,20 @@ class Test(unittest.TestCase):
    # get cleaned before (and after) running a CLI
    # (eg cleanout stale files from prior crash-runs)
    def test3_files_in_import_dir(self):
-        ddir = os.path.join(TEMP_DIR, "import_dbdir")
+        from gramps.gen.const import TEMP_DIR
+        ddir = os.path.join(TEMP_DIR,"import_dbdir")
        os.makedirs(ddir)
-        bogofiles = [os.path.join(ddir, fn) for fn in ("family.db", "lock")]
+        bogofiles = [os.path.join(ddir,fn) 
+            for fn in ("family.db", "lock")]
        for fn in bogofiles:
-            with io.open(fn, "w") as f:
-                f.write("garbage")
+            f = open(fn, "w").write("garbage")
        
        # ~same as test 2
        ifile = min1r
        ofile = out_ged
        gcmd = "Gramps.py -i %s -e %s" % (ifile, ofile)
-        process = subprocess.Popen("python %s" % gcmd,
-                                   stdin=subprocess.PIPE,
-                                   stdout=subprocess.PIPE,
-                                   stderr=subprocess.PIPE, shell=True)
-        result_str, err_str = process.communicate()
-        self.assertEqual(process.returncode, 0,
-                         "executed CLI command %r" % gcmd)
+        rc = os.system("python %s" % gcmd)
+        self.assertEquals(rc, 0, "executed CLI cmmand %r" % gcmd)

        for fn in bogofiles:
            self.assertFalse(os.path.exists(fn))
@@ -156,10 +143,10 @@ class UnicodeTest(unittest.TestCase):
    def test4_arbitrary_uncode_path(self):
        (dbpath, title) = self.cli.create_new_db_cli(self.newtitle)

-        self.assertEqual(self.newpath, os.path.dirname(dbpath),
+        self.assertEquals(self.newpath, os.path.dirname(dbpath),
                          "Compare paths %s and %s" % (repr(self.newpath),
                                                       repr(dbpath)))
-        self.assertEqual(self.newtitle, title, "Compare titles %s and %s" %
+        self.assertEquals(self.newtitle, title, "Compare titles %s and %s" %
                          (repr(self.newtitle), repr(title)))


@@ -19,6 +19,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

+# $Id$
+
 """ Unittest for user.py """

 from __future__ import print_function
@@ -17,6 +17,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
+# $Id$
+#

 """
 The User class provides basic interaction with the user.
@@ -54,14 +56,14 @@ _SPINNER = ['|', '/', '-', '\\']
 class User(user.User):
    """
    This class provides a means to interact with the user via CLI.
-    It implements the interface in :class:`.gen.user.User`
+    It implements the interface in gramps.gen.user.User()
    """
    def __init__(self, callback=None, error=None, auto_accept=False, quiet=False):
        """
        Init.

-        :param error: If given, notify_error delegates to this callback
-        :type error: function(title, error)
+        @param error: If given, notify_error delegates to this callback
+        @type error: function(title, error)
        """
        user.User.__init__(self, callback, error)
        self.steps = 0;
@@ -81,15 +83,15 @@ class User(user.User):
        """
        Start showing a progress indicator to the user.
        
-        :param title: the title of the progress meter
-        :type title: str
-        :param message: the message associated with the progress meter
-        :type message: str
-        :param steps: the total number of steps for the progress meter.
-                      a value of 0 indicates that the ending is unknown and the
-                      meter should just show activity.
-        :type steps: int
-        :returns: none
+        @param title: the title of the progress meter
+        @type title: str
+        @param message: the message associated with the progress meter
+        @type message: str
+        @param steps: the total number of steps for the progress meter.
+            a value of 0 indicates that the ending is unknown and the
+            meter should just show activity.
+        @type steps: int
+        @returns: none
        """
        self._fileout.write(message)
        self.steps = steps
@@ -117,23 +119,22 @@ class User(user.User):
        """
        self._fileout.write("\r100%\n")
    
-    def prompt(self, title, message, accept_label, reject_label, parent=None):
+    def prompt(self, title, message, accept_label, reject_label):
        """
        Prompt the user with a message to select an alternative.
        
-        :param title: the title of the question, e.g.: "Undo history warning"
-        :type title: str
-        :param message: the message, e.g.: "Proceeding with the tool will erase
-                        the undo history. If you think you may want to revert
-                        running this tool, please stop here and make a backup
-                        of the DB."
-        :type question: str
-        :param accept_label: what to call the positive choice, e.g.: "Proceed"
-        :type accept_label: str
-        :param reject_label: what to call the negative choice, e.g.: "Stop"
-        :type reject_label: str
-        :returns: the user's answer to the question
-        :rtype: bool
+        @param title: the title of the question, e.g.: "Undo history warning"
+        @type title: str
+        @param message: the message, e.g.: "Proceeding with the tool will
+            erase the undo history. If you think you may want to revert
+            running this tool, please stop here and make a backup of the DB."
+        @type question: str
+        @param accept_label: what to call the positive choice, e.g.: "Proceed"
+        @type accept_label: str
+        @param reject_label: what to call the negative choice, e.g.: "Stop"
+        @type reject_label: str
+        @returns: the user's answer to the question
+        @rtype: bool
        """
        accept_label = accept_label.replace("_", "")
        reject_label = reject_label.replace("_", "")
@@ -153,11 +154,11 @@ class User(user.User):
        """
        Warn the user.
        
-        :param title: the title of the warning
-        :type title: str
-        :param warning: the warning
-        :type warning: str
-        :returns: none
+        @param title: the title of the warning
+        @type title: str
+        @param warning: the warning
+        @type warning: str
+        @returns: none
        """
        self._fileout.write("%s %s" % (title, warning))
    
@@ -165,11 +166,11 @@ class User(user.User):
        """
        Notify the user of an error.
        
-        :param title: the title of the error
-        :type title: str
-        :param error: the error message
-        :type error: str
-        :returns: none
+        @param title: the title of the error
+        @type title: str
+        @param error: the error message
+        @type error: str
+        @returns: none
        """
        if self.error_function:
            self.error_function(title, error)
@@ -180,9 +181,9 @@ class User(user.User):
        """
        Notify the user of a DB error.
        
-        :param error: the error message
-        :type error: str
-        :returns: none
+        @param error: the error message
+        @type error: str
+        @returns: none
        """
        self.notify_error(
            _("Low level database corruption detected"),
@@ -195,4 +196,5 @@ class User(user.User):
        """
        Displays information to the CLI
        """
-        self._fileout.write("{} {}\n".format(msg1, infotext))
+        self._fileout.write(msg1)
+        self._fileout.write(infotext)
@@ -18,6 +18,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # gen/__init__.py
+# $Id$
+#

 """
 The gen module provides packages that are common to all gramps 
@@ -4,7 +4,7 @@
 #
 # Copyright (C) 2005-2007  Donald N. Allingham
 # Copyright (C) 2008-2009  Gary Burton 
-# Copyright (C) 2009-2012  Doug Blank <doug.blank@gmail.com>
+# Copyright (C) 2009       Doug Blank <doug.blank@gmail.com>
 # Copyright (C) 2011       Tim G L Lyons
 #
 # This program is free software; you can redistribute it and/or modify
@@ -22,6 +22,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

+# $Id$
+
 """
 This package implements access to GRAMPS configuration.
 """
@@ -150,7 +152,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/gramps41/")
+register('behavior.addons-url', "http://svn.code.sf.net/p/gramps-addons/code/branches/gramps40/")

 register('export.proxy-order', [
        ["privacy", 0], 
@@ -169,7 +171,6 @@ register('geography.zoom', 0)
 register('geography.zoom_when_center', 12)
 register('geography.show_cross', False)
 register('geography.path', "")
-register('geography.use-keypad', True)

 register('htmlview.start-url', "http://gramps-project.org")
 register('htmlview.url-handler', False)
@@ -245,10 +246,6 @@ register('interface.person-sel-height', 450)
 register('interface.person-sel-width', 600)
 register('interface.person-width', 750)
 register('interface.place-height', 450)
-register('interface.place-name-height', 100)
-register('interface.place-name-width', 450)
-register('interface.place-ref-height', 450)
-register('interface.place-ref-width', 600)
 register('interface.place-sel-height', 450)
 register('interface.place-sel-width', 600)
 register('interface.place-width', 650)
@@ -296,7 +293,6 @@ register('preferences.hide-ep-msg', False)
 register('preferences.invalid-date-format', "<b>%s</b>")
 register('preferences.iprefix', 'I%04d')
 register('preferences.name-format', 1)
-register('preferences.place-format', 0)
 register('preferences.patronimic-surname', False)
 register('preferences.no-given-text', "[%s]" % _("Missing Given Name"))
 register('preferences.no-record-text', "[%s]" % _("Missing Record"))
@@ -21,6 +21,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

+# $Id$
+
 """
 Provides constants for other modules
 """
@@ -49,7 +51,7 @@ from .constfunc import get_env_var, conv_to_unicode
 #
 #-------------------------------------------------------------------------
 PROGRAM_NAME   = "Gramps"
-from gramps.version import VERSION, VERSION_TUPLE, major_version
+from ..version import VERSION, VERSION_TUPLE, major_version
 #-------------------------------------------------------------------------
 #
 # Standard GRAMPS Websites
@@ -134,8 +136,8 @@ sys.path.insert(0, ROOT_DIR)
 git_revision = get_git_revision(ROOT_DIR)
 if sys.platform == 'win32' and git_revision == "":
    git_revision = get_git_revision(os.path.split(ROOT_DIR)[1])
-#VERSION += git_revision
-VERSION += "-1"
+VERSION += git_revision
+#VERSION += "-1"

 #
 # Glade files
@@ -193,8 +195,8 @@ GTK_GETTEXT_DOMAIN = 'gtk30'
 #-------------------------------------------------------------------------
 COPYRIGHT_MSG  = "© 2001-2006 Donald N. Allingham\n" \
                 "© 2007-2015 The Gramps Developers"
-COMMENTS       = _("Gramps\n (Genealogical Research and Analysis "
-                   "Management Programming System)\n"
+COMMENTS       = _("Gramps (Genealogical Research and Analysis "
+                   "Management Programming System)\n" 
                   "is a personal genealogy program.")
 AUTHORS        = [
    "Alexander Roitman",
@@ -215,6 +217,9 @@ DOCUMENTERS    = [
    'Alexander Roitman', 
    ]

+TRANSLATORS = _('TRANSLATORS: Translate this to your '
+                'name in your native language')
+
 #-------------------------------------------------------------------------
 #
 # Constants
@@ -225,8 +230,6 @@ THUMBSCALE_LARGE = 180.0
 XMLFILE          = "data.gramps"
 NO_SURNAME       = "(%s)" % _("none")
 NO_GIVEN         = "(%s)" % _("none")
-ARABIC_COMMA     = "،"
-ARABIC_SEMICOLON = "؛"

 #-------------------------------------------------------------------------
 #
@@ -19,6 +19,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

+# $Id$
+
 """
 Some independent constants/functions that can be safely imported
 without any translation happening yet.  Do _not_ add imports that will
@@ -18,12 +18,12 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

+# $Id$
+
 """
 Class handling language-specific selection for date parser and displayer.
 """

-from __future__ import print_function, unicode_literals
-
 #-------------------------------------------------------------------------
 #
 # set up logging
@@ -36,7 +36,6 @@ _ = glocale.translation.sgettext
 # import prerequisites for localized handlers
 from ._datehandler import (LANG, LANG_SHORT, LANG_TO_PARSER, LANG_TO_DISPLAY, 
                          register_datehandler)
-from . import _datestrings

 # Import all the localized handlers
 from . import _date_ar
@@ -92,16 +91,5 @@ except:

 # Import utility functions
 from ._dateutils import *
-from ._grampslocale import (codeset, tformat)
-
-if __name__ == "__main__":
-    from ._datedisplay import DateDisplay
-    m = 0
-    for l,d in LANG_TO_DISPLAY.items():
-        if len(l) != 2:
-            continue
-        m = max(m, len(d.formats))
-        print("{}: {} {} own dg: {}".format(
-            l, len(d.formats), d.formats, 
-            d._display_gregorian != DateDisplay._display_gregorian))
-    print("MAX: ", m)
+from ._grampslocale import (codeset, month_to_int, long_months, short_months, 
+                           long_days, short_days, tformat)
@@ -19,6 +19,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

+# $Id$
+
 """
 Arabic-specific classes for parsing and displaying dates.
 """
@@ -19,6 +19,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

+# $Id$
+
 """
 Bulgarian-specific classes for parsing and displaying dates.
 """
@@ -18,6 +18,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
+# $Id$
+#

 # Catalan Version, 2008 

@@ -18,6 +18,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
+# $Id$
+#

 """
 Czech-specific classes for parsing and displaying dates.
@@ -18,6 +18,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
+# $Id$
+#

 """
 Danish-specific classes for parsing and displaying dates.
@@ -19,6 +19,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

+# $Id$
+
 """
 German-specific classes for parsing and displaying dates.
 """
@@ -20,6 +20,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

+# $Id$
+
 """
 Greek-specific classes for parsing and displaying dates.
 """
@@ -19,6 +19,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

+# $Id$
+
 """
 Spanish-specific classes for parsing and displaying dates.
 """
@@ -19,6 +19,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

+# $Id$
+
 """
 Finnish-specific classes for parsing and displaying dates.
 """
@@ -21,6 +21,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

+# $Id$
+
 #-------------------------------------------------------------------------
 #
 # Python modules
@@ -58,15 +60,92 @@ class DateParserFR(DateParser):

    month_to_int = DateParser.month_to_int

+    # Custom short months not the same as long months
+
+    month_to_int["janv"] = 1
+    month_to_int["févr"] = 2
+    month_to_int["juil"] = 7
+    month_to_int["sept"] = 9
+    month_to_int["oct"] = 10
+    month_to_int["déc"] = 12
+
+    # Add common value
+
+    month_to_int["bluviose"] = 5
+    month_to_int["vendose"] = 6
+    month_to_int["7bre"] = 9
+    month_to_int["8bre"] = 10
+    month_to_int["9bre"] = 11
+    month_to_int["10bre"] = 12
+    month_to_int["xbre"] = 12
+
+    # Add common latin
+
+    month_to_int["januaris"] = 1
+    month_to_int["januarii"] = 1
+    month_to_int["januarius"] = 1
+    month_to_int["februaris"] = 2
+    month_to_int["februarii"] = 2
+    month_to_int["februarius"] = 2
+    month_to_int["martii"] = 3
+    month_to_int["martius"] = 3
+    month_to_int["aprilis"] = 4
+    month_to_int["maius"] = 5
+    month_to_int["maii"] = 5
+    month_to_int["junius"] = 6
+    month_to_int["junii"] = 6
+    month_to_int["julius"] = 7
+    month_to_int["julii"] = 7
+    month_to_int["augustus"] = 8
+    month_to_int["augusti"] = 8
+    month_to_int["septembris"] = 9
+    month_to_int["7bris"] = 9
+    month_to_int["september"] = 9
+    month_to_int["october"] = 10
+    month_to_int["octobris"] = 10
+    month_to_int["8bris"] = 10
+    month_to_int["novembris"] = 11
+    month_to_int["9bris"] = 11
+    month_to_int["november"] = 11
+    month_to_int["decembris"] = 12
+    month_to_int["10bris"] = 12
+    month_to_int["xbris"] = 12
+    month_to_int["december"] = 12
+
+    #local and historical variants
+    # Add common on east france
+
+    month_to_int["janer"] = 1
+    month_to_int["jenner"] = 1
+    month_to_int["hartmonat"] = 1
+    month_to_int["hartung"] = 1
+    month_to_int["eismond"] = 1
+    month_to_int["hornung"] = 2
+    month_to_int["wintermonat"] = 2
+    month_to_int["taumond"] = 2
+    month_to_int["narrenmond"] = 2
+    month_to_int["lenzing"] = 3
+    month_to_int["ostermond"] = 4
+    month_to_int["wonnemond"] = 5
+    month_to_int["wiesenmonat"] = 5
+    month_to_int["brachet"] = 6
+    month_to_int["heuet"] = 7
+    month_to_int["ernting"] = 8
+    month_to_int["scheiding"] = 9
+    month_to_int["gilbhard"] = 10
+    month_to_int["nebelmonat"] = 11
+    month_to_int["nebelung"] = 11
+    month_to_int["julmond"] = 12
+
    modifier_to_int = {
-        'avant'    : Date.MOD_BEFORE,
-        'av.'      : Date.MOD_BEFORE,
-        #u'av'     : Date.MOD_BEFORE, # Broke Hebrew "Av" month name
-        #u'<'      : Date.MOD_BEFORE, # Worrying about XML/HTML parsing
-        'après'    : Date.MOD_AFTER,
-        'ap.'      : Date.MOD_AFTER,
-        'ap'       : Date.MOD_AFTER,
-        #u'>'      : Date.MOD_AFTER, # Worrying about XML/HTML parsing
+        'avant': Date.MOD_BEFORE,
+        'av.'  : Date.MOD_BEFORE,
+        #u'av'  : Date.MOD_BEFORE, # Broke Hebrew "Av" month name
+        #u'<'    : Date.MOD_BEFORE, # Worrying about XML/HTML parsing
+        'après': Date.MOD_AFTER,
+        'ap.'  : Date.MOD_AFTER,
+        'ap'   : Date.MOD_AFTER,
+        #u'>'    : Date.MOD_AFTER, # Worrying about XML/HTML parsing
        'environ'  : Date.MOD_ABOUT,
        'env.'     : Date.MOD_ABOUT,
        'env'      : Date.MOD_ABOUT,
@@ -78,6 +157,23 @@ class DateParserFR(DateParser):
        '~'        : Date.MOD_ABOUT,
        }

+    calendar_to_int = {
+        'grégorien': Date.CAL_GREGORIAN,
+        'g'        : Date.CAL_GREGORIAN,
+        'julien': Date.CAL_JULIAN,
+        'j'     : Date.CAL_JULIAN,
+        'hébreu': Date.CAL_HEBREW,
+        'h'     : Date.CAL_HEBREW,
+        'islamique': Date.CAL_ISLAMIC,
+        'i'        : Date.CAL_ISLAMIC,
+        'révolutionnaire': Date.CAL_FRENCH,
+        'r'              : Date.CAL_FRENCH,
+        'perse': Date.CAL_PERSIAN,
+        'p'    : Date.CAL_PERSIAN,
+        'suédois': Date.CAL_SWEDISH,
+        's'      : Date.CAL_SWEDISH,
+        }
+
    quality_to_int = {
        'estimée': Date.QUAL_ESTIMATED,
        'est.'   : Date.QUAL_ESTIMATED,
@@ -96,7 +192,7 @@ class DateParserFR(DateParser):
    def init_strings(self):
        """
        This method compiles regular expression strings for matching dates.
-
+        
        Most of the re's in most languages can stay as is. span and range
        most likely will need to change. Whatever change is done, this method
        may be called first as DateParser.init_strings(self) so that the
@@ -106,119 +202,46 @@ class DateParserFR(DateParser):
        """
        DateParser.init_strings(self)

-        DateParser.calendar_to_int.update({
-            'révolutionnaire'  : Date.CAL_FRENCH,
-            'r'                : Date.CAL_FRENCH,
-            'perse'            : Date.CAL_PERSIAN,
-        })
-
-        DateParser.month_to_int.update({
-            "januaris"    : 1,
-            "januarii"    : 1,
-            "januarius"   : 1,
-            "janer"       : 1,
-            "jänner"      : 1,
-            "jenner"      : 1,
-            "hartmonat"   : 1,
-            "hartung"     : 1,
-            "horn"        : 1,
-            "eismond"     : 1,
-            "februaris"   : 2,
-            "februarii"   : 2,
-            "februarius"  : 2,
-            "hornig"      : 2,
-            "hornung"     : 2,
-            "wintermonat" : 2,
-            "taumond"     : 2,
-            "narrenmond"  : 2,
-            "martii"      : 3,
-            "martius"     : 3,
-            "lenzing"     : 3,
-            "aprilis"     : 4,
-            "ostermond"   : 4,
-            "maius"       : 5,
-            "maii"        : 5,
-            "maien"       : 5,
-            "bluviose"    : 5,
-            "wonnemond"   : 5,
-            "wiesenmonat" : 5,
-            "junius"      : 6,
-            "junii"       : 6,
-            "vendose"     : 6,
-            "brachet"     : 6,
-            "julius"      : 7,
-            "julii"       : 7,
-            "heuet"       : 7,
-            "heuert"      : 7,
-            "augustus"    : 8,
-            "augusti"     : 8,
-            "ernting"     : 8,
-            "septembris"  : 9,
-            "7bre"        : 9,
-            "7bris"       : 9,
-            "september"   : 9,
-            "scheidling"  : 9,
-            "october"     : 10,
-            "octobris"    : 10,
-            "8bre"        : 10,
-            "8bris"       : 10,
-            "gilbhard"    : 10,
-            "november"    : 11,
-            "novembris"   : 11,
-            "9bre"        : 11,
-            "9bris"       : 11,
-            "nebelmonat"  : 11,
-            "nebelung"    : 11,
-            "december"    : 12,
-            "decembris"   : 12,
-            "10bre"       : 12,
-            "10bris"      : 12,
-            "xbre"        : 12,
-            "xbris"       : 12,
-            "julmond"     : 12,
-            "christmond"  : 12,
-        })
-
        # This self._numeric is different from the base
        # avoid bug gregorian / french calendar conversion (+/-10 days)

-        self._numeric = re.compile(r"((\d+)[/\. ])?\s*((\d+)[/\.])?\s*(\d+)\s*$")
-        self._span = re.compile(r"(de)\s+(?P<start>.+)\s+(à)\s+(?P<stop>.+)",
+        self._numeric = re.compile("((\d+)[/\. ])?\s*((\d+)[/\.])?\s*(\d+)\s*$")
+        self._span = re.compile("(de)\s+(?P<start>.+)\s+(à)\s+(?P<stop>.+)",
                                re.IGNORECASE)
-        self._range = re.compile(r"(entre|ent\.|ent)\s+(?P<start>.+)\s+(et)\s+(?P<stop>.+)",
+        self._range = re.compile("(entre|ent\.|ent)\s+(?P<start>.+)\s+(et)\s+(?P<stop>.+)",
                                 re.IGNORECASE)

-        # This self._text are different from the base
-        # by adding ".?" after the first date and removing "\s*$" at the end
+    # This self._text are different from the base
+    # by adding ".?" after the first date and removing "\s*$" at the end

-        #gregorian and julian
+    #gregorian and julian

-        self._text2 = re.compile(r'(\d+)?.?\s+?%s\s*((\d+)(/\d+)?)?' %
+        self._text2 = re.compile('(\d+)?.?\s+?%s\s*((\d+)(/\d+)?)?' %
                                 self._mon_str, re.IGNORECASE)

-        #hebrew
+    #hebrew

-        self._jtext2 = re.compile(r'(\d+)?.?\s+?%s\s*((\d+)(/\d+)?)?' %
+        self._jtext2 = re.compile('(\d+)?.?\s+?%s\s*((\d+)(/\d+)?)?' %
                                  self._jmon_str, re.IGNORECASE)

-        #french
+    #french

-        self._ftext2 = re.compile(r'(\d+)?.?\s+?%s\s*((\d+)(/\d+)?)?' %
+        self._ftext2 = re.compile('(\d+)?.?\s+?%s\s*((\d+)(/\d+)?)?' %
                                  self._fmon_str, re.IGNORECASE)

-        #persian
+    #persian

-        self._ptext2 = re.compile(r'(\d+)?.?\s+?%s\s*((\d+)(/\d+)?)?' %
+        self._ptext2 = re.compile('(\d+)?.?\s+?%s\s*((\d+)(/\d+)?)?' %
                                  self._pmon_str, re.IGNORECASE)

-        #islamic
+    #islamic

-        self._itext2 = re.compile(r'(\d+)?.?\s+?%s\s*((\d+)(/\d+)?)?' %
+        self._itext2 = re.compile('(\d+)?.?\s+?%s\s*((\d+)(/\d+)?)?' %
                                  self._imon_str, re.IGNORECASE)

-        #swedish
+    #swedish

-        self._stext2 = re.compile(r'(\d+)?.?\s+?%s\s*((\d+)(/\d+)?)?' %
+        self._stext2 = re.compile('(\d+)?.?\s+?%s\s*((\d+)(/\d+)?)?' %
                                  self._smon_str, re.IGNORECASE)

 #-------------------------------------------------------------------------
@@ -228,8 +251,21 @@ class DateParserFR(DateParser):
 #-------------------------------------------------------------------------
 class DateDisplayFR(DateDisplay):
    """
-    French language date display class.
+    French language date display class. 
    """
+    long_months = ( "", "janvier", "février", "mars", "avril", "mai", 
+                    "juin", "juillet", "août", "septembre", "octobre", 
+                    "novembre", "décembre" )
+    
+    short_months = ( "", "janv", "févr", "mars", "avril", "mai", "juin", 
+                     "juil", "août", "sept", "oct", "nov", "déc" )
+
+    calendar = ("", "Julien", "Hébreu", "Révolutionnaire",
+                "Perse", "Islamique", "Suédois")
+
+    _mod_str = ("", "avant ", "après ", "vers ", "", "", "")
+
+    _qual_str = ("", "estimée ", "calculée ", "")

    _bce_str = "%s avant le calendrier"

@@ -239,7 +275,7 @@ class DateDisplayFR(DateDisplay):
    _locale_tformat = _locale_tformat.replace('%d', "J")
    _locale_tformat = _locale_tformat.replace('%m', "M")
    _locale_tformat = _locale_tformat.replace('%Y', "A")
-
+    
    formats = ("AAAA-MM-JJ (ISO)",  # 0
               "Défaut système (" + _locale_tformat + ")",        # 1
               "Jour Mois Année",   # 2
@@ -247,11 +283,11 @@ class DateDisplayFR(DateDisplay):
               "Jour. Mois Année",  # 4
               "Jour. MOI Année",   # 5
               "Mois Jour, Année",  # 6
-               "MOI Jour, Année",)  # 7
-
+               "MOI Jour, Année",   # 7
+               )
        # this definition must agree with its "_display_gregorian" method

-    def _display_gregorian(self, date_val, **kwargs):
+    def _display_gregorian(self, date_val):
        """
        display gregorian calendar date in different format
        """
@@ -291,7 +327,7 @@ class DateDisplayFR(DateDisplay):
                    value = "%s %s" % (self.long_months[date_val[1]], year)
            else:

-                value = "%d %s %s" % (date_val[0],
+                value = "%d %s %s" % (date_val[0], 
                                      self.long_months[date_val[1]], year)
        elif self.format == 3:

@@ -304,7 +340,7 @@ class DateDisplayFR(DateDisplay):
                    value = "%s %s" % (self.short_months[date_val[1]], year)
            else:

-                value = "%d %s %s" % (date_val[0],
+                value = "%d %s %s" % (date_val[0], 
                                      self.short_months[date_val[1]], year)
        elif self.format == 4:

@@ -318,10 +354,10 @@ class DateDisplayFR(DateDisplay):
            else:

                # base_display :
-                # value = "%d %s %s" % (date_val[0],
+                # value = "%d %s %s" % (date_val[0], 
                #                       self.long_months[date_val[1]], year)

-                value = "%d. %s %s" % (date_val[0],
+                value = "%d. %s %s" % (date_val[0], 
                                       self.long_months[date_val[1]],
                                       year)
        elif self.format == 5:
@@ -336,11 +372,11 @@ class DateDisplayFR(DateDisplay):
            else:

                # base_display :
-                # value = "%d %s %s" % (date_val[0],
+                # value = "%d %s %s" % (date_val[0], 
                #                       self.short_months[date_val[1]], year)

-                value = "%d. %s %s" % (date_val[0],
-                                       self.short_months[date_val[1]], year)
+                value = "%d. %s %s" % (date_val[0], 
+                                      self.short_months[date_val[1]], year)
        elif self.format == 6:

            # month_name day, year
@@ -367,13 +403,46 @@ class DateDisplayFR(DateDisplay):
                                       date_val[0], year)
        else:
            return self.display_iso(date_val)
-
+                        
        if date_val[2] < 0:
            return self._bce_str % value
        else:
            return value

-    display = DateDisplay.display_formatted
+    def display(self, date):
+        """
+        Return a text string representing the date.
+        """
+
+        mod = date.get_modifier()
+        cal = date.get_calendar()
+        qual = date.get_quality()
+        start = date.get_start_date()
+        newyear = date.get_new_year()
+
+        qual_str = (self._qual_str)[qual]
+
+        if mod == Date.MOD_TEXTONLY:
+            return date.get_text()
+        elif start == Date.EMPTY:
+            return ""
+        elif mod == Date.MOD_SPAN:
+            date1 = self.display_cal[cal](start)
+            date2 = self.display_cal[cal](date.get_stop_date())
+            scal = self.format_extras(cal, newyear)
+            return "%s%s %s %s %s%s" % (qual_str, 'de', date1, 'à', 
+            date2, scal)
+        elif mod == Date.MOD_RANGE:
+            date1 = self.display_cal[cal](start)
+            date2 = self.display_cal[cal](date.get_stop_date())
+            scal = self.format_extras(cal, newyear)
+            return "%s%s %s %s %s%s" % (qual_str, 'entre', date1, 'et',
+                    date2, scal)
+        else:
+            text = self.display_cal[date.get_calendar()](start)
+            scal = self.format_extras(cal, newyear)
+            return "%s%s%s%s" % (qual_str, (self._mod_str)[mod], text, 
+            scal)

 #-------------------------------------------------------------------------
 #
@@ -382,4 +451,4 @@ class DateDisplayFR(DateDisplay):
 #-------------------------------------------------------------------------

 register_datehandler(('fr_FR', 'fr', 'french', 'French', 'fr_CA',
-                      'fr_BE', 'fr_CH'), DateParserFR, DateDisplayFR)
+                     'fr_BE', 'fr_CH'), DateParserFR, DateDisplayFR)
@@ -18,7 +18,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
-# $Id: _date_hr.py 22672 2013-07-13 18:01:08Z paul-franklin $
+# $Id$
 #

 # Croatian version 2008 by Josip
@@ -50,6 +50,98 @@ from ._datehandler import register_datehandler
 #
 #-------------------------------------------------------------------------
 class DateParserHR(DateParser):
+    """
+    Converts a text string into a Date object
+    """
+    month_to_int = DateParser.month_to_int
+    
+    month_to_int["siječanj"] = 1
+    month_to_int["siječnja"] = 1
+    month_to_int["sij"] = 1
+    month_to_int["januar"] = 1
+    month_to_int["januara"] = 1
+    month_to_int["i"] = 1
+    
+    month_to_int["veljača"] = 2
+    month_to_int["veljače"] = 2
+    month_to_int["velj"] = 2
+    month_to_int["februar"] = 2
+    month_to_int["februara"] = 2
+    month_to_int["ii"]  = 2
+    
+    month_to_int["ožujak"] = 3
+    month_to_int["ožujka"] = 3
+    month_to_int["ožu"] = 3
+    month_to_int["mart"] = 3
+    month_to_int["marta"] = 3
+    month_to_int["iii"]  = 3
+    
+    month_to_int["travanj"] = 4
+    month_to_int["travnja"] = 4
+    month_to_int["tra"] = 4
+    month_to_int["april"] = 4
+    month_to_int["aprila"] = 4
+    month_to_int["iv"]  = 4
+
+    month_to_int["svibanj"] = 5
+    month_to_int["svibnja"] = 5
+    month_to_int["svi"] = 5
+    month_to_int["maj"] = 5
+    month_to_int["maja"] = 5
+    month_to_int["v"]  = 5
+    
+    month_to_int["lipanj"] = 6
+    month_to_int["lipnja"] = 6
+    month_to_int["lip"] = 6
+    month_to_int["jun"] = 6
+    month_to_int["juna"] = 6
+    month_to_int["vi"]  = 6
+
+    month_to_int["srpanj"]  = 7
+    month_to_int["srpnja"]  = 7
+    month_to_int["srp"]  = 7
+    month_to_int["juli"]  = 7
+    month_to_int["jula"]  = 7
+    month_to_int["vii"]  = 7
+    
+    month_to_int["kolovoz"]  = 8
+    month_to_int["kolovoza"]  = 8
+    month_to_int["kol"]  = 8
+    month_to_int["august"]  = 8
+    month_to_int["augusta"]  = 8
+    month_to_int["viii"]  = 8
+    
+    month_to_int["rujan"]  = 9
+    month_to_int["rujna"]  = 9
+    month_to_int["ruj"]  = 9
+    month_to_int["septembar"]  = 9
+    month_to_int["septembra"]  = 9
+    month_to_int["ix"]  = 9
+    month_to_int["7ber"]  = 9
+    
+    month_to_int["listopad"]  = 10
+    month_to_int["listopada"]  = 10
+    month_to_int["lis"]  = 10
+    month_to_int["oktobar"]  = 10
+    month_to_int["oktobra"]  = 10
+    month_to_int["x"]  = 10
+    month_to_int["8ber"]  = 10
+    
+    month_to_int["studeni"]  = 11
+    month_to_int["studenog"]  = 11
+    month_to_int["stu"]  = 11
+    month_to_int["novembar"]  = 11
+    month_to_int["novembra"]  = 11
+    month_to_int["xi"]  = 11
+    month_to_int["9ber"]  = 11
+    
+    month_to_int["prosinac"]  = 12
+    month_to_int["prosinca"]  = 12
+    month_to_int["pro"]  = 12
+    month_to_int["decembar"]  = 12
+    month_to_int["decembra"]  = 12
+    month_to_int["xii"]  = 12
+    
    modifier_to_int = {
        'prije'    : Date.MOD_BEFORE, 
        'pr. '    : Date.MOD_BEFORE,
@@ -60,6 +152,23 @@ class DateParserHR(DateParser):
       
        }

+    calendar_to_int = {
+        'gregorijanski'  : Date.CAL_GREGORIAN,
+        'greg.'          : Date.CAL_GREGORIAN,
+        'julijanski'     : Date.CAL_JULIAN,
+        'jul.'           : Date.CAL_JULIAN,
+        'hebrejski'      : Date.CAL_HEBREW,
+        'hebr.'          : Date.CAL_HEBREW,
+        'islamski'      : Date.CAL_ISLAMIC,
+        'isl.'           : Date.CAL_ISLAMIC,
+        'francuski republikanski': Date.CAL_FRENCH,
+        'franc.'         : Date.CAL_FRENCH,
+        'perzijski'       : Date.CAL_PERSIAN,
+        'perz. '       : Date.CAL_PERSIAN,
+        'švedski'      : Date.CAL_SWEDISH, 
+        's'            : Date.CAL_SWEDISH, 
+        }
+
    quality_to_int = {
        'približno' : Date.QUAL_ESTIMATED,
        'prb.'      : Date.QUAL_ESTIMATED,
@@ -77,16 +186,18 @@ class DateParserHR(DateParser):
        DateParser.init_strings(self)
        # match 'Day. MONTH year.' format with or without dots
        self._text2 = re.compile('(\d+)?\.?\s*?%s\.?\s*((\d+)(/\d+)?)?\s*\.?$'
-                                            % self._mon_str, re.IGNORECASE)
+                                % self._mon_str, re.IGNORECASE)
        # match Day.Month.Year.
-        self._numeric = re.compile(
-                                 "((\d+)[/\. ])?\s*((\d+)[/\.])?\s*(\d+)\.?$")
-        self._span = re.compile(
-                            "(od)\s+(?P<start>.+)\s+(do)\s+(?P<stop>.+)",
+        self._numeric  = re.compile(
+                                    "((\d+)[/\. ])?\s*((\d+)[/\.])?\s*(\d+)\.?$"
+                                    )
+        self._span  = re.compile("(od)\s+(?P<start>.+)\s+(do)\s+(?P<stop>.+)", 
+                                re.IGNORECASE)
+        self._range = re.compile(
+                            "(između)\s+(?P<start>.+)\s+(i)\s+(?P<stop>.+)", 
                            re.IGNORECASE)
        self._jtext2 = re.compile('(\d+)?.?\s+?%s\s*((\d+)(/\d+)?)?'\
-                                % self._jmon_str, re.IGNORECASE) 
-        
+                                % self._jmon_str, re.IGNORECASE)

 #-------------------------------------------------------------------------
 #
@@ -97,44 +208,150 @@ class DateDisplayHR(DateDisplay):
    """
    Croatian language date display class. 
    """
-     # TODO fix BUG 7064: non-Gregorian calendars wrongly use BCE notation for negative dates
-    # not refactoring _bce_str into base class because it'll be gone under #7064  
+    long_months = ( "", 
+        "siječnja",
+        "veljače",
+        "ožujka",
+        "travnja",
+        "svibnja",
+        "lipnja",
+        "srpnja",
+        "kolovoza",
+        "rujna",
+        "listopada",
+        "studenog",
+        "prosinca" 
+        )
+    
+    #currently unused
+    short_months = ( "", "sij", "velj", "ožu", "tra", "svi", "lip",
+        "srp", "kol", "ruj", "lis", "stu", "pro"
+        )
+    
+    calendar = (
+        "", "julijanski", "hebrejski", 
+        "francuski republikanski", "perzijski", "islamski",
+        "swedish" 
+        )
+
+    _mod_str = ("", "prije ", "poslije ", "okolo ", "", "", "")
+
+    _qual_str = ("", "približno ", "izračunato ")
+    
    _bce_str = "%s p.n.e."

-    display = DateDisplay.display_formatted
+    formats = (
+        "GGGG-MM-DD (ISO-8601)", 
+        "Numerički", 
+        "D.M.GGGG.",
+        "D. MMMM GGGG.",
+        "D. Rb GGGG."
+        )
+        # this definition must agree with its "_display_gregorian" method
    
-    def dd_dformat01(self, date_val):
+    roman_months = (
+        "",
+        "I",
+        "II",
+        "III",
+        "IV",
+        "V",
+        "VI",
+        "VII",
+        "VIII",
+        "IX",
+        "X",
+        "XI",
+        "XII"
+        )
+        
+    def _display_gregorian(self, date_val):
        """
-        numerical
-        """
-        if date_val[3]:
-            return self.display_iso(date_val)
-        else:
-            if date_val[0] == date_val[1] == 0:
-                return str(date_val[2]) + '.'
-            else:
-                value = self._tformat.replace('%m', str(date_val[1]))
-                value = value.replace('%d', str(date_val[0]))
-                value = value.replace('%Y', str(abs(date_val[2])))
-                return value
-
-    def dd_dformat04(self, date_val, inflect, long_months):
-        """
-        day month_name year
+        display gregorian calendar date in different format
        """
+        # this must agree with its locale-specific "formats" definition
        year = self._slash_year(date_val[2], date_val[3])
-        if date_val[0] == 0:
-            if date_val[1] == 0:
-                return year + '.'
+        if self.format == 0:
+            return self.display_iso(date_val)
+        elif self.format == 1:
+            # numerical
+            if date_val[3]:
+                return self.display_iso(date_val)
            else:
-                return self.format_long_month_year(date_val[1], year,
-                                                   inflect, long_months)
+                if date_val[0] == 0 and date_val[1] == 0:
+                    value = str(date_val[2])
+                else:
+                    value = self._tformat.replace('%m', str(date_val[1]))
+                    value = value.replace('%d', str(date_val[0]))
+                    value = value.replace('%Y', str(abs(date_val[2])))
+                    value = value.replace('-', '/')
+        elif self.format == 2:
+            # day.month_number.year.
+            if date_val[0] == 0:
+                if date_val[1] == 0:
+                    value = year
+                else:
+                    value = "%s.%s." % (date_val[1], year)
+            else:
+                value = "%s.%d.%s." % (date_val[0], date_val[1], year)
+        elif self.format == 3:
+            # day. month_name year.
+            if date_val[0] == 0:
+                if date_val[1] == 0:
+                    value = "%s." % year
+                else:
+                    value = "%s %s." % (self.long_months[date_val[1]], year)
+            else:
+                value = "%d. %s %s." % (date_val[0], 
+                                        self.long_months[date_val[1]], year)
        else:
-            return "{day:d}. {long_month.f[G]} {year}.".format(
-                     day = date_val[0],
-                     long_month = long_months[date_val[1]],
-                     year = year)
+            # day. Roman_number_month year.
+            if date_val[0] == 0:
+                if date_val[1] == 0:
+                    value = "%s." % year
+                else:
+                    value = "%s %s." % (self.roman_months[date_val[1]], year)
+            else:
+                value = "%d. %s %s." % (date_val[0],
+                                        self.roman_months[date_val[1]], year)
+        if date_val[2] < 0:
+            return self._bce_str % value
+        else:
+            return value

+    def display(self, date):
+        """
+        Return a text string representing the date.
+        """
+        mod = date.get_modifier()
+        cal = date.get_calendar()
+        qual = date.get_quality()
+        start = date.get_start_date()
+        newyear = date.get_new_year()
+
+        qual_str = self._qual_str[qual]
+        
+        if mod == Date.MOD_TEXTONLY:
+            return date.get_text()
+        elif start == Date.EMPTY:
+            return ""
+        elif mod == Date.MOD_SPAN:
+            d_1 = self.display_cal[cal](start)
+            d_2 = self.display_cal[cal](date.get_stop_date())
+            scal = self.format_extras(cal, newyear)
+            return "%s%s %s %s %s%s" % (qual_str, 'od', d_1, 'do', d_2,
+                                                            scal)
+        elif mod == Date.MOD_RANGE:
+            d_1 = self.display_cal[cal](start)
+            d_2 = self.display_cal[cal](date.get_stop_date())
+            scal = self.format_extras(cal, newyear)
+            return "%s%s %s %s %s%s" % (qual_str, 'između', d_1, 'i', d_2, 
+                                                            scal)
+        else:
+            text = self.display_cal[date.get_calendar()](start)
+            scal = self.format_extras(cal, newyear)
+            return "%s%s%s%s" % (qual_str, self._mod_str[mod], text, 
+                                                scal)

 #-------------------------------------------------------------------------
 #
@@ -18,6 +18,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
+# $Id$
+#

 # Italian version, 2009 (derived from the catalan version)

@@ -19,6 +19,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

+# $Id$
+
 """
 Lithuanian-specific classes for parsing and displaying dates.
 """
@@ -19,6 +19,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

+# $Id$
+
 """
 Norwegian-specific classes for parsing and displaying dates.
 """
@@ -19,6 +19,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

+# $Id$
+
 # Written by Benny Malengier
 # Last change 2005/12/05:
 # Correspond  naming of dates with actual action, so for abbreviation
@@ -18,6 +18,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
+# $Id$
+#

 # Polish version 2007 by Piotr Czubaszek
 # Updated in 2010 by Łukasz Rymarczyk
@@ -21,6 +21,8 @@
 # Portuguese version translated by Duarte Loreto <happyguy_pt@hotmail.com>, 2007.
 # Based on the Spanish file.

+# $Id$
+
 """
 Portuguese-specific classes for parsing and displaying dates.
 """
@@ -19,6 +19,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

+# $Id$
+
 """
 Russian-specific classes for parsing and displaying dates.
 """
@@ -46,10 +48,11 @@ from ._datehandler import register_datehandler
 #
 #-------------------------------------------------------------------------
 class DateParserRU(DateParser):
+
    modifier_to_int = {
        'перед'    : Date.MOD_BEFORE, 
-        'по'    : Date.MOD_BEFORE, 
        'до'    : Date.MOD_BEFORE, 
+        'по'    : Date.MOD_BEFORE, 
        'после' : Date.MOD_AFTER, 
        'п.'    : Date.MOD_AFTER, 
        'п'    : Date.MOD_AFTER, 
@@ -67,6 +70,22 @@ class DateParserRU(DateParser):
        'прибл'  : Date.MOD_ABOUT, 
        }

+    calendar_to_int = {
+        'григорианский' : Date.CAL_GREGORIAN, 
+        'г'            : Date.CAL_GREGORIAN, 
+        'юлианский'     : Date.CAL_JULIAN, 
+        'ю'            : Date.CAL_JULIAN, 
+        'еврейский'         : Date.CAL_HEBREW, 
+        'е'         : Date.CAL_HEBREW, 
+        'исламский'         : Date.CAL_ISLAMIC, 
+        'и'                 : Date.CAL_ISLAMIC, 
+        'республиканский': Date.CAL_FRENCH, 
+        'р'                 : Date.CAL_FRENCH, 
+        'персидский'             : Date.CAL_PERSIAN, 
+        'п'             : Date.CAL_PERSIAN, 
+        'swedish'      : Date.CAL_SWEDISH, 
+        's'            : Date.CAL_SWEDISH, 
+        }

    quality_to_int = {
        'оценено'  : Date.QUAL_ESTIMATED, 
@@ -81,18 +100,126 @@ class DateParserRU(DateParser):
        'выч' : Date.QUAL_CALCULATED, 
        }

+    hebrew_to_int = {
+        "тишрей":1, 
+        "тишрея":1, 
+        "хешван":2, 
+        "хешвана":2, 
+        "кислев":3, 
+        "кислева":3, 
+        "тевет":4, 
+        "тевета":4, 
+        "шеват":5, 
+        "шевата":5, 
+        "адар":6, 
+        "адара":6, 
+        "адара бет":7, 
+        "нисан":8, 
+        "нисана":8, 
+        "ниссан":8, 
+        "ниссана":8, 
+        "ияр":9, 
+        "ияра":9, 
+        "сиван":10, 
+        "сивана":10, 
+        "тамуз":11, 
+        "тамуза":11, 
+        "таммуз":11, 
+        "таммуза":11, 
+        "ав":12, 
+        "ава":12, 
+        "элул":13, 
+        "элула":13, 
+        "элуль":13, 
+        "элуля":13, 
+    }
+
+    islamic_to_int = {
+        "мухаррам":1, 
+        "мухаррама":1, 
+        "сафар":2, 
+        "сафара":2, 
+        "раби-аль-авваль":3, 
+        "раби-аль-авваля":3, 
+        "раби-ассани":4, 
+        "джумада-аль-уля":5, 
+        "джумада-аль-ахира":6, 
+        "раджаб":7, 
+        "раджаба":7, 
+        "шаабан":8, 
+        "шаабана":8, 
+        "рамадан":9, 
+        "рамадана":9, 
+        "шавваль":10, 
+        "шавваля":10, 
+        "зуль-каада":11, 
+        "зуль-хиджжа":12, 
+        }
+
+    persian_to_int = {
+        "фарвардин":1, 
+        "фарвардина":1, 
+        "урдбихишт":2, 
+        "урдбихишта":2, 
+        "хурдад":3, 
+        "хурдада":3, 
+        "тир":4, 
+        "тира":4, 
+        "мурдад":5, 
+        "мурдада":5, 
+        "шахривар":6, 
+        "шахривара":6, 
+        "михр":7, 
+        "михра":7, 
+        "абан":8, 
+        "абана":8, 
+        "азар":9, 
+        "азара":9, 
+        "дай":10, 
+        "дая":10, 
+        "бахман":11, 
+        "бахмана":11, 
+        "исфаидармуз":12, 
+        "исфаидармуза":12, 
+        }
+
+    french_to_int = {
+        "вандемьер":1, 
+        "вандемьера":1, 
+        "брюмер":2, 
+        "брюмера":2, 
+        "фример":3, 
+        "фримера":3, 
+        "нивоз":4, 
+        "нивоза":4, 
+        "плювиоз":5, 
+        "плювиоза":5, 
+        "вантоз":6, 
+        "вантоза":6, 
+        "жерминаль":7, 
+        "жерминаля":7, 
+        "флореаль":8, 
+        "флореаля":8, 
+        "прериаль":9, 
+        "прериаля":9, 
+        "мессидор":10, 
+        "мессидора":10, 
+        "термидор":11, 
+        "термидора":11, 
+        "фрюктидор":12, 
+        "фрюктидора":12, 
+        "доп.":13, 
+        "дополн.":13, 
+        "дополнит.":13, 
+        }
+
    bce = [
        'до нашей эры', 'до н. э.', 'до н.э.', 
        'до н э', 'до нэ'] + DateParser.bce

    def init_strings(self):
        DateParser.init_strings(self)
-        DateParser.calendar_to_int.update({
-            'персидский'    : Date.CAL_PERSIAN, 
-            'п'             : Date.CAL_PERSIAN, 
-        })
        _span_1 = ['с', 'от']
-        #_span_2 = ['по', 'до'] # <-- clashes with bce parsing :-(
        _span_2 = ['по']
        _range_1 = ['между', 'меж\.', 'меж']
        _range_2 = ['и']
@@ -112,29 +239,136 @@ class DateDisplayRU(DateDisplay):
    """
    Russian language date display class. 
    """
+    long_months = ( "", "января", "февраля", "марта", "апреля", "мая", 
+                    "июня", "июля", "августа", "сентября", "октября", 
+                    "ноября", "декабря" )
+    
+    short_months = ( "", "янв", "фев", "мар", "апр", "мая", "июн", 
+                     "июл", "авг", "сен", "окт", "ноя", "дек" )
+    
+    calendar = (
+        "", 
+        "юлианский", 
+        "еврейский", 
+        "республиканский", 
+        "персидский", 
+        "исламский", 
+        "шведский" 
+        )
+
+    _mod_str = (
+        "", 
+        "до ", 
+        "после ", 
+        "около ", 
+        "", "", "")
+    
+    _qual_str = ("", "оцен ", "вычисл ")

-    # TODO fix BUG 7064: non-Gregorian calendars wrongly use BCE notation for negative dates
-    # not refactoring _bce_str into base class because it'll be gone under #7064
    _bce_str = "%s до н.э."

-    display = DateDisplay.display_formatted
+    formats = (
+        "ГГГГ-ММ-ДД (ISO)", "Численный", "Месяц День, Год", 
+        "МЕС ДД, ГГГГ", "День Месяц, Год", "ДД МЕС, ГГГГ"
+        )
+        # this must agree with DateDisplayEn's "formats" definition
+        # (since no locale-specific _display_gregorian exists, here)

-    def dd_dformat04(self, date_val, inflect, long_months):
+    hebrew = ( "", 
+        "тишрея", 
+        "хешвана", 
+        "кислева", 
+        "тевета", 
+        "шевата", 
+        "адара", 
+        "адара бет", 
+        "нисана", 
+        "ияра", 
+        "сивана", 
+        "таммуза", 
+        "ава", 
+        "элула", 
+        )
+
+    islamic = ( "", 
+        "мухаррама", 
+        "сафара", 
+        "раби-аль-авваля", 
+        "раби-ассани", 
+        "джумада-аль-уля", 
+        "джумада-аль-ахира", 
+        "раджаба", 
+        "шаабана", 
+        "рамадана", 
+        "шавваля", 
+        "зуль-каада", 
+        "зуль-хиджжа", 
+        )
+
+    persian = ( "", 
+        "фарвардина", 
+        "урдбихишта", 
+        "хурдада", 
+        "тира", 
+        "мурдада", 
+        "шахривара", 
+        "михра", 
+        "абана", 
+        "азара", 
+        "дая", 
+        "бахмана", 
+        "исфаидармуза", 
+        )
+
+    french = ( "", 
+        "вандемьера", 
+        "брюмера", 
+        "фримера", 
+        "нивоза", 
+        "плювиоза", 
+        "вантоза", 
+        "жерминаля", 
+        "флореаля", 
+        "прериаля", 
+        "мессидора", 
+        "термидора", 
+        "фрюктидора", 
+        "дополнит."
+        )
+
+    def display(self, date):
        """
-        day month_name year -- for Russian locale
+        Return a text string representing the date.
        """
-        year = self._slash_year(date_val[2], date_val[3])
-        if date_val[0] == 0:
-            if date_val[1] == 0:
-                return year
-            else:
-                return self.format_long_month_year(date_val[1], year,
-                                                   inflect, long_months)
+        mod = date.get_modifier()
+        cal = date.get_calendar()
+        qual = date.get_quality()
+        start = date.get_start_date()
+        newyear = date.get_new_year()
+
+        qual_str = self._qual_str[qual]
+        
+        if mod == Date.MOD_TEXTONLY:
+            return date.get_text()
+        elif start == Date.EMPTY:
+            return ""
+        elif mod == Date.MOD_SPAN:
+            d1 = self.display_cal[cal](start)
+            d2 = self.display_cal[cal](date.get_stop_date())
+            scal = self.format_extras(cal, newyear)
+            return "%sс %s %s %s%s" % (qual_str, d1, 'по', d2, 
+                                       scal)
+        elif mod == Date.MOD_RANGE:
+            d1 = self.display_cal[cal](start)
+            d2 = self.display_cal[cal](date.get_stop_date())
+            scal = self.format_extras(cal, newyear)
+            return "%s%s %s %s %s%s" % (qual_str, 'между', d1, 'и', 
+                                        d2, scal)
        else:
-            return "{day:d} {long_month.f[Р]} {year}".format(
-                     day = date_val[0],
-                     long_month = long_months[date_val[1]],
-                     year = year)
+            text = self.display_cal[date.get_calendar()](start)
+            scal = self.format_extras(cal, newyear)
+            return "%s%s%s%s" % (qual_str, self._mod_str[mod], 
+                                 text, scal)

 #-------------------------------------------------------------------------
 #
@@ -18,6 +18,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
+# $Id$
+#

 # Slovenian version 2010 by Bernard Banko, based on croatian one by Josip

@@ -18,6 +18,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
+# $Id$
+#

 # Serbian version by Vlada Perić <vlada.peric@gmail.com>, 2009.
 # Based on the Croatian DateHandler by Josip
@@ -230,15 +232,46 @@ class DateParserSR(DateParser):
 # Serbian display
 #
 #-------------------------------------------------------------------------
-class DateDisplaySR_Base(DateDisplay):
+class DateDisplaySR_latin(DateDisplay):
    """
-    Serbian (base) date display class
+    Serbian (latin) date display class
    """
+    long_months = ("",
+        "januara", "februara", "marta", "aprila",
+        "maja", "juna", "jula", "avgusta",
+        "septembra", "oktobra", "novembra", "decembra"
+        )
+
+    short_months = ("",
+        "jan", "feb", "mar", "apr", "maj", "jun",
+        "jul", "avg", "sep", "okt", "nov", "dec"
+        ) 

    roman_months = (
        "", "I", "II", "III", "IV", "V", "VI",
        "VII", "VIII", "IX", "X", "XI", "XII"
        )
+    
+    calendar = (
+        "", "julijanski", "hebrejski", 
+        "francuski republikanski", "persijski", "islamski",
+        "švedski" 
+        )
+
+    _mod_str = ("", "pre ", "posle ", "oko ", "", "", "")
+
+    _qual_str = ("", "procenjeno ", "izračunato ")
+    
+    _bce_str = "%s p.n.e."
+
+    formats = (
+        "GGGG-MM-DD (ISO-8601)", 
+        "Numerički (DD.MM.GGGG.)", 
+        "D. MMM GGGG.",
+        "D. Mesec GGGG.",
+        "D. Rb GGGG."
+        )
+        # this definition must agree with its "_display_gregorian" method

    def _display_gregorian(self, date_val):
        """
@@ -307,10 +340,6 @@ class DateDisplaySR_Base(DateDisplay):
        newyear = date.get_new_year()

        qual_str = self._qual_str[qual]
-        span1 = self._span1
-        span2 = self._span2
-        range1 = self._range1
-        range2 = self._range2
        
        if mod == Date.MOD_TEXTONLY:
            return date.get_text()
@@ -320,13 +349,13 @@ class DateDisplaySR_Base(DateDisplay):
            d_1 = self.display_cal[cal](start)
            d_2 = self.display_cal[cal](date.get_stop_date())
            scal = self.format_extras(cal, newyear)
-            return "%s%s %s %s %s%s" % (qual_str, span1, d_1, span2, d_2,
+            return "%s%s %s %s %s%s" % (qual_str, 'od', d_1, 'do', d_2,
                                                            scal)
        elif mod == Date.MOD_RANGE:
            d_1 = self.display_cal[cal](start)
            d_2 = self.display_cal[cal](date.get_stop_date())
            scal = self.format_extras(cal, newyear)
-            return "%s%s %s %s %s%s" % (qual_str, range1, d_1, range2, d_2,
+            return "%s%s %s %s %s%s" % (qual_str, 'između', d_1, 'i', d_2, 
                                                            scal)
        else:
            text = self.display_cal[date.get_calendar()](start)
@@ -334,98 +363,11 @@ class DateDisplaySR_Base(DateDisplay):
            return "%s%s%s%s" % (qual_str, self._mod_str[mod], text, 
                                                scal)

-class DateDisplaySR_Latin(DateDisplaySR_Base):
-    """
-    Serbian (Latin) date display class
-    """
-
-    long_months = ("",
-        "januara", "februara", "marta", "aprila",
-        "maja", "juna", "jula", "avgusta",
-        "septembra", "oktobra", "novembra", "decembra"
-        )
-
-    short_months = ("",
-        "jan", "feb", "mar", "apr", "maj", "jun",
-        "jul", "avg", "sep", "okt", "nov", "dec"
-        ) 
-
-    calendar = (
-        "", "julijanski", "hebrejski", 
-        "francuski republikanski", "persijski", "islamski",
-        "švedski" 
-        )
-
-    _mod_str = ("", "pre ", "posle ", "oko ", "", "", "")
-
-    _qual_str = ("", "procenjeno ", "izračunato ")
-    
-    _bce_str = "%s p.n.e."
-
-    formats = (
-        "GGGG-MM-DD (ISO-8601)", 
-        "Numerički (DD.MM.GGGG.)", 
-        "D. MMM GGGG.",
-        "D. Mesec GGGG.",
-        "D. Rb GGGG."
-        )
-        # this definition must agree with its "_display_gregorian" method
-
-    _span1 = 'od'
-    _span2 = 'do'
-    _range1 = 'između'
-    _range2 = 'i'
-
-class DateDisplaySR_Cyrillic(DateDisplaySR_Base):
-    """
-    Serbian (Cyrillic) date display class
-    """
-
-    long_months = ("",
-        "Јануар", "Фебруар", "Март", "Април",
-        "Мај", "Јуне", "Јули", "Аугуст",
-        "Септембар", "Оцтобер", "Новембер", "Децембар"
-        )
-
-    short_months = ("",
-        "Јан", "Феб", "Мар", "Апр", "Мај", "Јун",
-        "Јул", "Авг", "Сеп", "Окт", "Нов", "Дец"
-        ) 
-
-    calendar = (
-        "", "Јулиан", "хебрејски", 
-        "француски републиканац", "Персиан", "исламски",
-        "шведски" 
-        )
-
-    _mod_str = ("", "пре ", "после ", "око ", "", "", "")
-
-    _qual_str = ("", "процењено ", "израчунато ")
-    
-    _bce_str = "%s п.н.е."
-
-    formats = (
-        "ГГГГ-ММ-ДД (ISO-8601)", 
-        "Нумеричка (ДД.ММ.ГГГГ.)", 
-        "Д. МММ ГГГГ.",
-        "Д. Месец ГГГГ.",
-        "Д. Rb ГГГГ."
-        )
-        # this definition must agree with its "_display_gregorian" method
-
-    _span1 = 'из'
-    _span2 = 'до'
-    _range1 = 'између'
-    _range2 = 'и'

 #-------------------------------------------------------------------------
 #
 # Register classes
 #
 #-------------------------------------------------------------------------
-register_datehandler(('srpski', 'Srpski',
-                      'sr_Latn', 'sr_Latn_RS', 'sr_RS@latin'),
-                     DateParserSR, DateDisplaySR_Latin)
-register_datehandler(('sr', 'српски', 'Српски', 'serbian',
-                      'sr_RS', 'sr_Cyrl', 'sr_Cyrl_RS'),
-                     DateParserSR, DateDisplaySR_Cyrillic)
+register_datehandler(('sr', 'serbian', 'srpski', 'sr_RS'),
+                                    DateParserSR, DateDisplaySR_latin)
@@ -19,6 +19,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

+# $Id$
+
 """
 Swedish-specific classes for parsing and displaying dates.
 """
@@ -3,7 +3,7 @@
 # Gramps - a GTK+/GNOME based genealogy program
 #
 # Copyright (C) 2004-2006  Donald N. Allingham
-# Copyright (C) 2013-2014  Fedir Zinchuk <fedikw[at]gmail.com>
+# Copyright (C) 2013       Fedir Zinchuk <fedikw[at]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
@@ -20,6 +20,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

+# $Id$
+
 """
 Ukrainian-specific classes for parsing and displaying dates.
 """
@@ -42,6 +44,7 @@ from ..lib.date import Date
 from ._dateparser import DateParser
 from ._datedisplay import DateDisplay
 from ._datehandler import register_datehandler
+from . import _grampslocale

 #-------------------------------------------------------------------------
 #
@@ -50,10 +53,53 @@ from ._datehandler import register_datehandler
 #-------------------------------------------------------------------------
 class DateParserUK(DateParser):
    """
-    Convert a text string into a :class:`.Date` object. If the date cannot be
+    Convert a text string into a Date object. If the date cannot be
    converted, the text string is assigned.
    """

+    month_to_int = DateParser.month_to_int
+
+    # the genitive
+    month_to_int["січня"] = 1
+    month_to_int["лютого"] = 2
+    month_to_int["березня"] = 3
+    month_to_int["квітня"] = 4
+    month_to_int["травня"] = 5
+    month_to_int["червня"] = 6
+    month_to_int["липня"] = 7
+    month_to_int["серпня"] = 8
+    month_to_int["вересня"] = 9
+    month_to_int["жовтня"] = 10
+    month_to_int["листопада"] = 11
+    month_to_int["грудня"] = 12
+
+    # some short variants of the months
+    month_to_int["січ."] = 1
+    month_to_int["січ"] = 1
+    month_to_int["лют."] = 2
+    month_to_int["лют"] = 2
+    month_to_int["бер."] = 3
+    month_to_int["бер"] = 3
+    month_to_int["квіт."] = 4
+    month_to_int["квіт"] = 4
+    month_to_int["трав."] = 5
+    month_to_int["трав"] = 5
+    month_to_int["черв."] = 6
+    month_to_int["черв"] = 6
+    month_to_int["лип."] = 7
+    month_to_int["лип"] = 7
+    month_to_int["серп."] = 8
+    month_to_int["серп"] = 8
+    month_to_int["вер."] = 9
+    month_to_int["вер"] = 9
+    month_to_int["жовт."] = 10
+    month_to_int["жовт"] = 10
+    month_to_int["лист."] = 11
+    month_to_int["лист"] = 11
+    month_to_int["груд."] = 12
+    month_to_int["груд"] = 12
+
+
    # modifiers before the date
    modifier_to_int = {
        'перед'    : Date.MOD_BEFORE,
@@ -72,6 +118,89 @@ class DateParserUK(DateParser):
        'біля'     : Date.MOD_ABOUT,
        }

+    hebrew_to_int = {
+        "тішрі"    : 1,    "хешвен"   : 2,    "кіслев"   : 3,
+        "тевет"    : 4,    "шват"     : 5,    "адар"     : 6,
+        "адара"    : 7,    "нісан"    : 8,    "іяр"      : 9,
+        "сиван"    : 10,   "таммуз"   : 11,   "ав"       : 12,
+        "елул"     : 13,
+        #alternative spelling
+        "мархешван": 2, "ве адар"  : 7,
+        #GEDCOM months
+        "tsh" : 1, "csh": 5, "ksl": 3, "tvt": 4, "shv": 5, "adr": 6,
+        "ads" : 7, "nsn": 8, "iyr": 9, "svn":10, "tmz":11, "aav":12,
+        "ell":13,
+        }
+
+    french_to_int = {
+        'вандем’єр'  : 1,    'брюмер'   : 2,
+        'фрімер'     : 3,    'нівоз'    : 4,
+        'плювіоз'    : 5,    'вентоз'   : 6,
+        'жерміналь'  : 7,    'флореаль' : 8,
+        'преріаль'   : 9,    'мессідор' : 10,
+        'термідор'   : 11,   'фрюктідор': 12,
+        'додатковий' : 13,
+        #short
+        'ванд' : 1,    'брюм' : 2,
+        'фрім' : 3,    'нів'  : 4,
+        'плюв' : 5,    'вент' : 6,
+        'жерм' : 7,    'флор' : 8,
+        'прер' : 9,    'месс' : 10,
+        'терм' : 11,   'фрюкт': 12,
+        'дод'  : 13,
+        #GEDCOM months
+        'vend'    : 1,    'brum' : 2,
+        'frim'    : 3,    'nivo' : 4,
+        'pluv'    : 5,    'vent' : 6,
+        'germ'    : 7,    'flor' : 8,
+        'prai'    : 9,    'mess' : 10,
+        'ther'    : 11,   'fruc' : 12,
+        'comp'    : 13,
+        }
+
+    islamic_to_int = {
+        "мухаррам"           : 1,  "мухаррем"           : 1,
+        "сафар"              : 2,  "рабі-аль-авваль"    : 3,
+        "рабі-ассані"        : 4,
+        "джумада-аль-уля"    : 5,  "джумада-аль-авваль" : 5,
+        "джумада-аль-ахіра"  : 6,  "джумада-ас-сані"    : 6,
+        "раджаб"             : 7,  "шаабан"             : 8,
+        "рамадан"            : 9,  "рамазан"            : 9,
+        "шавваль"            : 10, "зуль-каада"         : 11,
+        "зуль-хіджжа"        : 12,
+        }
+
+    persian_to_int = {
+        "фарвардін" : 1,  "ордібехешт"  : 2,
+        "хордад"    : 3,  "тир"         : 4,
+        "мордад"    : 5,  "шахрівар"    : 6,
+        "мехр"      : 7,  "абан"        : 8,
+        "азар"      : 9,  "дей"         : 10,
+        "бахман"    : 11, "есфанд"      : 12,
+        }
+
+    bce = ['до нашої ери', 'до н. е.', 'до н.е.']
+
+    calendar_to_int = {
+        'григоріанський'              : Date.CAL_GREGORIAN,
+        'г'                           : Date.CAL_GREGORIAN,
+        'юліанський'                  : Date.CAL_JULIAN,
+        'ю'                           : Date.CAL_JULIAN,
+        'єврейський'                  : Date.CAL_HEBREW,
+        'є'                           : Date.CAL_HEBREW,
+        'ісламський'                  : Date.CAL_ISLAMIC,
+        'і'                           : Date.CAL_ISLAMIC,
+        'французький'                 : Date.CAL_FRENCH,
+        'французький республіканський': Date.CAL_FRENCH,
+        'французький революційний'    : Date.CAL_FRENCH,
+        'ф'                           : Date.CAL_FRENCH,
+        'іранський'                   : Date.CAL_PERSIAN,
+        'перський'                    : Date.CAL_PERSIAN,
+        'п'                           : Date.CAL_PERSIAN,
+        'шведський'                   : Date.CAL_SWEDISH,
+        'ш'                           : Date.CAL_SWEDISH,
+        }
+
    quality_to_int = {
        'за оцінкою'  : Date.QUAL_ESTIMATED,
        'за оц.'      : Date.QUAL_ESTIMATED,
@@ -79,7 +208,6 @@ class DateParserUK(DateParser):
        'орієнтовно'  : Date.QUAL_ESTIMATED,
        'приблизно'   : Date.QUAL_ESTIMATED,
        'прибл.'      : Date.QUAL_ESTIMATED,
-
        'підраховано' : Date.QUAL_CALCULATED,
        'підрах.'     : Date.QUAL_CALCULATED,
        'розраховано' : Date.QUAL_CALCULATED,
@@ -87,11 +215,6 @@ class DateParserUK(DateParser):
        'розрах.'     : Date.QUAL_CALCULATED,
        }

-    bce = [
-        'до нашої ери', 'до н. е.', 'до н.е.',
-        'до народження Христа'
-        ] + DateParser.bce
-
    def init_strings(self):
        """
        This method compiles regular expression strings for matching dates.
@@ -100,19 +223,12 @@ class DateParserUK(DateParser):
        """
        DateParser.init_strings(self)

-        DateParser.hebrew_to_int.update({
-            'мархешван': 2,
-            'ве адар'  : 7,
-            'адар бет' : 7,
-            'авів'     : 8,
-        })
-
        _span_1 = ['з', 'від']
        # b.c.e. pattern also have "до" so skip "до н."
-        _span_2 = ['по', 'до(?!\s+н)']
+        _span_2 = ['по', 'до?!\sн\.']
        _range_1 = ['між']
        _range_2 = ['і', 'та']
-        self._span  = re.compile("(%s)\s+(?P<start>.+)\s+(%s)\s+(?P<stop>.+)" %
+        self._span =  re.compile("(%s)\s+(?P<start>.+)\s+(%s)\s+(?P<stop>.+)" %
                                 ('|'.join(_span_1), '|'.join(_span_2)),
                                 re.IGNORECASE)
        self._range = re.compile("(%s)\s+(?P<start>.+)\s+(%s)\s+(?P<stop>.+)" %
@@ -129,10 +245,115 @@ class DateDisplayUK(DateDisplay):
    Ukrainian language date display class.
    """

+# the months as the noun or as the genitive???
+
+# as the genitive:
+    long_months = (
+        "", "січня", "лютого", "березня", "квітня",
+        "травня", "червня", "липня", "серпня",
+        "вересня", "жовтня", "листопада", "грудня"
+        )
+
+# as the noun:
+#    long_months = (
+#        "", "січень", "лютий", "березень", "квітень",
+#        "травень", "червень", "липень", "серпень",
+#        "вересень", "жовтень", "листопад", "грудень"
+#        )
+
+    short_months = (
+        "", "січ.", "лют.", "бер.", "квіт.", "трав.", "черв.",
+        "лип.", "серп.", "вер.", "жовт.", "лист.", "груд."
+        )
+
+    hebrew = (
+        "", "тішрі", "хешвен", "кіслев", "тевет", "шват",
+        "адар", "адара", "нісан", "іяр", "сиван", "таммуз",
+        "ав", "елул"
+        )
+
+    french = (
+        '', 'вандем’єр', 'брюмер', 'фрімер', 'нівоз',
+        'плювіоз', 'вентоз', 'жерміналь', 'флореаль',
+        'преріаль', 'мессідор', 'термідор', 'фрюктідор',
+        'додатковий'
+        )
+
+    persian = (
+        "", "фарвардін", "ордібехешт", "хордад", "тир",
+        "мордад", "шахрівар", "мехр", "абан",
+        "азар", "дей", "бахман", "есфанд"
+        )
+
+    islamic = (
+        "", "мухаррам", "сафар",  "рабі-аль-авваль",
+        "рабі-ассані", "джумада-аль-уля", "джумада-аль-ахіра",
+        "раджаб",  "шаабан", "рамадан", "шавваль", "зуль-каада",
+        "зуль-хіджжа",
+        )
+
+    # Replace the previous "Numerical" by a string which
+    # do have an explicit meaning: "System default (format)"
+    _locale_tformat = _grampslocale.tformat
+    _locale_tformat = _locale_tformat.replace('%d', "д")
+    _locale_tformat = _locale_tformat.replace('%m', "м")
+    _locale_tformat = _locale_tformat.replace('%Y', "р")
+
+    formats = (
+        "рррр-мм-дд (ISO)", #0
+        "стандартний для системи (" + _locale_tformat + ")", #1
+        "місяць день, рік", #2
+        "міс. дд, рррр",    #3
+        "день місяць рік",  #4
+        "дд міс. рррр"      #5
+        )
+        # this must agree with DateDisplayEn's "formats" definition
+        # (since no locale-specific _display_gregorian exists, here)
+
+    calendar = (
+        "", "юліанський", "єврейський", "французький республіканський",
+        "іранський", "ісламський", "шведський"
+        )
+
+    _mod_str = ("", "до ", "після ", "близько ", "", "", "")
+
+    _qual_str = ("", "орієнтовно ", "розрахунково ")
+
    _bce_str = "%s до н.е."

-    display = DateDisplay.display_formatted
+    def display(self, date):
+        """
+        Return a text string representing the date.
+        """
+        mod = date.get_modifier()
+        cal = date.get_calendar()
+        qual = date.get_quality()
+        start = date.get_start_date()
+        newyear = date.get_new_year()

+        qual_str = self._qual_str[qual]
+
+        if mod == Date.MOD_TEXTONLY:
+            return date.get_text()
+        elif start == Date.EMPTY:
+            return ""
+        elif mod == Date.MOD_SPAN:
+            d1 = self.display_cal[cal](start)
+            d2 = self.display_cal[cal](date.get_stop_date())
+            scal = self.format_extras(cal, newyear)
+            return "%sз %s %s %s%s" % (qual_str, d1, 'по', d2,
+                                       scal)
+        elif mod == Date.MOD_RANGE:
+            d1 = self.display_cal[cal](start)
+            d2 = self.display_cal[cal](date.get_stop_date())
+            scal = self.format_extras(cal, newyear)
+            return "%s%s %s %s %s%s" % (qual_str, 'між', d1, 'та',
+                                        d2, scal)
+        else:
+            text = self.display_cal[date.get_calendar()](start)
+            scal = self.format_extras(cal, newyear)
+            return "%s%s%s%s" % (qual_str, self._mod_str[mod],
+                                 text, scal)

 #-------------------------------------------------------------------------
 #
@@ -18,6 +18,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
+# $Id$
+#

 #-------------------------------------------------------------------------
 #
@@ -3,8 +3,6 @@
 # Gramps - a GTK+/GNOME based genealogy program
 #
 # Copyright (C) 2004-2006  Donald N. Allingham
-# Copyright (C) 2013       Vassilii Khachaturov
-# Copyright (C) 2014       Paul Franklin
 #
 # 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
@@ -20,6 +18,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
+# $Id$

 """
 U.S English date display class. Should serve as the base class for all
@@ -42,8 +41,6 @@ log = logging.getLogger(".DateDisplay")
 #-------------------------------------------------------------------------
 from ..lib.date import Date
 from . import _grampslocale
-from ..utils.grampslocale import GrampsLocale
-from ._datestrings import DateStrings

 #-------------------------------------------------------------------------
 #
@@ -54,62 +51,78 @@ class DateDisplay(object):
    """
    Base date display class. 
    """
-    _locale = GrampsLocale(lang='en_US', languages='en')
+    long_months = ( "", "January", "February", "March", "April", "May", 
+                    "June", "July", "August", "September", "October", 
+                    "November", "December" )
+    
+    short_months = ( "", "Jan", "Feb", "Mar", "Apr", "May", "Jun",
+                     "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" )

    _tformat = _grampslocale.tformat

-    _ = _grampslocale.glocale.translation.sgettext
-    formats = (
-        # format 0 - must always be ISO
-        _("YYYY-MM-DD (ISO)"), 
-
-        # format # 1 - must always be locale-preferred numerical format
-        # such as YY.MM.DD, MM-DD-YY, or whatever your locale prefers.
-        # This should be the format that is used under the locale by 
-        # strftime() for '%x'.
-        # You may translate this as "Numerical", "System preferred", or similar.
-        _("date format|Numerical"), 
-
-        # Full month name, day, year
-        _("Month Day, Year"), 
-
-        # Abbreviated month name, day, year
-        _("MON DAY, YEAR"), 
-
-        # Day, full month name, year
-        _("Day Month Year"), 
-
-        # Day, abbreviated month name, year
-        _("DAY MON YEAR")
+    hebrew = (
+        "", "Tishri", "Heshvan", "Kislev", "Tevet", "Shevat", 
+        "AdarI", "AdarII", "Nisan", "Iyyar", "Sivan", "Tammuz", 
+        "Av", "Elul"
+        )
+    
+    french = (
+        '', 
+        "Vendémiaire", 
+        'Brumaire', 
+        'Frimaire', 
+        "Nivôse", 
+        "Pluviôse", 
+        "Ventôse", 
+        'Germinal', 
+        "Floréal", 
+        'Prairial', 
+        'Messidor', 
+        'Thermidor', 
+        'Fructidor', 
+        'Extra', 
+        )
+    
+    persian = (
+        "", "Farvardin", "Ordibehesht", "Khordad", "Tir", 
+        "Mordad", "Shahrivar", "Mehr", "Aban", "Azar", 
+        "Dey", "Bahman", "Esfand"
+        )
+    
+    islamic = (
+        "", "Muharram", "Safar", "Rabi`al-Awwal", "Rabi`ath-Thani", 
+        "Jumada l-Ula", "Jumada t-Tania", "Rajab", "Sha`ban", 
+        "Ramadan", "Shawwal", "Dhu l-Qa`da", "Dhu l-Hijja"
        )
-    """
-    .. note:: Will be overridden if a locale-specific date displayer exists.

-    If your localized :meth:`~_display_calendar`/:meth:`~_display_gregorian` 
-    are overridden, you should override the whole formats list according
-    to your own formats, and you need not localize the format names here.
-    This ``formats`` must agree with
-    :meth:`~_display_calendar`/:meth:`~_display_gregorian`.
-    """
-    del _
+    swedish = (
+        "", "Januari", "Februari", "Mars",
+        "April", "Maj", "Juni",
+        "Juli", "Augusti", "September",
+        "Oktober", "November", "December"
+        )
+
+    formats = ("YYYY-MM-DD (ISO)", )
+    # this will be overridden if a locale-specific date displayer exists
+
+    calendar = (
+        "", "Julian", "Hebrew", "French Republican", 
+        "Persian", "Islamic", "Swedish" 
+        )
+    # this will be overridden if a locale-specific date displayer exists

    newyear = ("", "Mar1", "Mar25", "Sep1")
    
+    _mod_str = ("", "before ", "after ", "about ", "", "", "")
+    # this will be overridden if a locale-specific date displayer exists
+
+    _qual_str = ("", "estimated ", "calculated ")
+    # this will be overridden if a locale-specific date displayer exists
+    
    _bce_str = "%s B.C.E."
    # this will be overridden if a locale-specific date displayer exists

    def __init__(self, format=None):
-        self._ds = DateStrings(self._locale)
-        calendar = list(self._ds.calendar)
-        calendar[Date.CAL_GREGORIAN] = "" # that string only used in parsing,
-        # gregorian cal name shouldn't be output!
-        self.calendar = tuple(calendar)
-        self.short_months = self._ds.short_months
-        self.swedish = self.long_months = self._ds.long_months
-        self.hebrew = self._ds.hebrew
-        self.french = self._ds.french
-        self.persian = self._ds.persian
-        self.islamic = self._ds.islamic
        self.display_cal = [
            self._display_gregorian, 
            self._display_julian, 
@@ -118,132 +131,12 @@ class DateDisplay(object):
            self._display_persian, 
            self._display_islamic, 
            self._display_swedish]
-        self._mod_str = self._ds.modifiers
-        self._qual_str = self._ds.qualifiers
-        self.long_days = self._ds.long_days

        if format is None:
            self.format = 0
        else:
            self.format = format

-        self._ = _ = self._locale.translation.sgettext
-        self.FORMATS_long_month_year = {
-# Inflection control due to modifier.
-# Protocol: DateDisplayXX passes a key to the dictionary in the 
-# parameter ``inflect`` to ``_display_calendar``.
-# The modifier passed is not necessarily the one printed, it's just
-# a representative that induces the same inflection control.
-# For example, in Russian "before May", "after May", and "about May"
-# all require genitive form for May, whereas no modifier (just "May 1234")
-# require nominative, so DateDisplayRU.display will pass "before"
-# in all 3 cases, collapsing the 3 modifiers into 1.
-# 
-# Another example in Russian is that "between April 1234 and June 1235"
-# requires the same inflection for both April and June, so just "between"
-# is used by DateDisplayRU.display, collapsing two more modifiers into 1.
-#
-# If inflect is not specified, then it means that the modifier doesn't have
-# grammatical control over the format, and so the format can be
-# localized in a context-free way.
-# The translator is responsible for:
-# 1) proper collapse of modifier classes
-# 2) translating the formats that are selected in runtime
-# 3) ignoring the other formats in .po (it does no harm to translate them,
-# it's just a lot of extra work)
-#
-# To prevent POT pollution, not all possibilities are populated here yet.
-# To be amended as the actual localized handlers use it.
-#
-# Not moving to DateStrings, as this is part of display code only,
-# coupled tightly with the formats used in this file.
-                ""
-                : _("{long_month} {year}"),
-
-                "from"
-                # first date in a span
-                # You only need to translate this string if you translate one of the
-                # inflect=_("...") with "from"
-                : _("from|{long_month} {year}"),
-
-                "to"
-                # second date in a span
-                # You only need to translate this string if you translate one of the
-                # inflect=_("...") with "to"
-                : _("to|{long_month} {year}"),
-
-                "between"
-                # first date in a range
-                # You only need to translate this string if you translate one of the
-                # inflect=_("...") with "between"
-                : _("between|{long_month} {year}"),
-
-                "and"
-                # second date in a range
-                # You only need to translate this string if you translate one of the
-                # inflect=_("...") with "and"
-                : _("and|{long_month} {year}"),
-
-                "before"
-                # If "before <Month>" needs a special inflection in your
-                # language, translate this to "{long_month.f[X]} {year}"
-                # (where X is one of the month-name inflections you defined)
-                : _("before|{long_month} {year}"),
-
-                "after"
-                # If "after <Month>" needs a special inflection in your
-                # language, translate this to "{long_month.f[X]} {year}"
-                # (where X is one of the month-name inflections you defined)
-                : _("after|{long_month} {year}"),
-
-                "about"
-                # If "about <Month>" needs a special inflection in your
-                # language, translate this to "{long_month.f[X]} {year}"
-                # (where X is one of the month-name inflections you defined)
-                : _("about|{long_month} {year}"),
-
-            # TODO if no modifier, but with qual, might need to inflect in some lang.
-        }
-
-        self.FORMATS_short_month_year = {
-                ""
-                : _("{short_month} {year}"),
-
-                "from" 
-                # first date in a span
-                : _("from|{short_month} {year}"),
-
-                "to" 
-                # second date in a span
-                : _("to|{short_month} {year}"),
-
-                "between" 
-                # first date in a range
-                : _("between|{short_month} {year}"),
-
-                "and" 
-                # second date in a range
-                : _("and|{short_month} {year}"),
-
-                "before" 
-                # If "before <Month>" needs a special inflection in your
-                # language, translate this to "{short_month.f[X]} {year}"
-                # (where X is one of the month-name inflections you defined)
-                : _("before|{short_month} {year}"),
-
-                "after" 
-                # If "after <Month>" needs a special inflection in your
-                # language, translate this to "{short_month.f[X]} {year}"
-                # (where X is one of the month-name inflections you defined)
-                : _("after|{short_month} {year}"),
-
-                "about" 
-                # If "about <Month>" needs a special inflection in your
-                # language, translate this to "{short_month.f[X]} {year}"
-                # (where X is one of the month-name inflections you defined)
-                : _("about|{short_month} {year}"),
-        }
-
    def set_format(self, format):
        self.format = format

@@ -271,10 +164,7 @@ class DateDisplay(object):
    def display(self, date):
        """
        Return a text string representing the date.
-
-        Disregard any format settings and use display_iso for each date.
-
-        (Will be overridden if a locale-specific date displayer exists.)
+        (will be overridden if a locale-specific date displayer exists)
        """
        mod = date.get_modifier()
        cal = date.get_calendar()
@@ -328,297 +218,133 @@ class DateDisplay(object):
        else:
            return value

-    def display_formatted(self, date):
-        """
-        Return a text string representing the date, according to the format.
-        """
-        mod = date.get_modifier()
-        cal = date.get_calendar()
-        qual = date.get_quality()
-        start = date.get_start_date()
-        newyear = date.get_new_year()
-
-        qual_str = self._qual_str[qual]
-        _ = self._
-        
-        if mod == Date.MOD_TEXTONLY:
-            return date.get_text()
-        elif start == Date.EMPTY:
-            return ""
-        elif mod == Date.MOD_SPAN:
-            d1 = self.display_cal[cal](start, 
-                    # If there is no special inflection for "from <Month>" in your
-                    # language, don't translate this string.
-                    # Otherwise, translate it to the ENGLISH!!! ENGLISH!!! 
-                    # key appearing above in the FORMATS_... dict
-                    # that maps to the special inflected format string that you need to localize.
-                    inflect=_("from-date|"))
-            d2 = self.display_cal[cal](date.get_stop_date(), 
-                    # If there is no special inflection for "to <Month>" in your
-                    # language, don't translate this string.
-                    # Otherwise, translate it to the ENGLISH!!! ENGLISH!!! 
-                    # key appearing above in the FORMATS_... dict
-                    # that maps to the special inflected format string that you need to localize.
-                    inflect=_("to-date|"))
-            scal = self.format_extras(cal, newyear)
-            return _("{date_quality}from {date_start} to {date_stop}"
-                    "{nonstd_calendar_and_ny}").format(
-                    date_quality=qual_str, 
-                    date_start=d1, 
-                    date_stop=d2, 
-                    nonstd_calendar_and_ny=scal)
-        elif mod == Date.MOD_RANGE:
-            d1 = self.display_cal[cal](start,
-                    # If there is no special inflection for "between <Month>" in your
-                    # language, don't translate this string.
-                    # Otherwise, translate it to the ENGLISH!!! ENGLISH!!! 
-                    # key appearing above in the FORMATS_... dict
-                    # that maps to the special inflected format string that you need to localize.
-                    inflect=_("between-date|"))
-            d2 = self.display_cal[cal](date.get_stop_date(),
-                    # If there is no special inflection for "and <Month>" in your
-                    # language, don't translate this string.
-                    # Otherwise, translate it to the ENGLISH!!! ENGLISH!!! 
-                    # key appearing above in the FORMATS_... dict
-                    # that maps to the special inflected format string that you need to localize.
-                    inflect=_("and-date|"))
-            scal = self.format_extras(cal, newyear)
-            return _("{date_quality}between {date_start} and {date_stop}"
-                    "{nonstd_calendar_and_ny}").format(
-                    date_quality=qual_str, 
-                    date_start=d1, 
-                    date_stop=d2, 
-                    nonstd_calendar_and_ny=scal)
-        else:
-            if mod == Date.MOD_BEFORE:
-                # If there is no special inflection for "before <Month>"
-                # in your language, DON'T translate this string.  Otherwise,
-                # "translate" this to "before" in ENGLISH!!! ENGLISH!!!
-                date_type = _("before-date|")
-            elif mod == Date.MOD_AFTER:
-                # If there is no special inflection for "after <Month>"
-                # in your language, DON'T translate this string.  Otherwise,
-                # "translate" this to "after" in ENGLISH!!! ENGLISH!!!
-                date_type = _("after-date|")
-            elif mod == Date.MOD_ABOUT:
-                # If there is no special inflection for "about <Month>"
-                # in your language, DON'T translate this string.  Otherwise,
-                # "translate" this to "about" in ENGLISH!!! ENGLISH!!!
-                date_type = _("about-date|")
-            else:
-                date_type = ""
-            text = self.display_cal[cal](start, inflect=date_type)
-            scal = self.format_extras(cal, newyear)
-            return _("{date_quality}{noncompound_modifier}{date}"
-                    "{nonstd_calendar_and_ny}").format(
-                    date_quality=qual_str, 
-                    noncompound_modifier=self._mod_str[mod],
-                    date=text, 
-                    nonstd_calendar_and_ny=scal)
-
-    def _display_gregorian(self, date_val, **kwargs):
-        return self._display_calendar(date_val, self.long_months, 
-                self.short_months, **kwargs)
-
-    # Julian and Swedish date display is the same as Gregorian
-    _display_julian = _display_swedish = _display_gregorian
-
-    def format_long_month_year(self, month, year, inflect, long_months):
-        if not hasattr(long_months[1], 'f'): # not a Lexeme: no inflection
-            return "{long_month} {year}".format(
-                     long_month = long_months[month], year = year)
-        return self.FORMATS_long_month_year[inflect].format(
-                     long_month = long_months[month], year = year)
-
-    def format_short_month_year(self, month, year, inflect, short_months):
-        if not hasattr(short_months[1], 'f'): # not a Lexeme: no inflection
-            return "{short_month} {year}".format(
-                     short_month = short_months[month], year = year)
-        return self.FORMATS_short_month_year[inflect].format(
-                     short_month = short_months[month], year = year)
-
-    def format_long_month(self, month, inflect, long_months):
-        if not hasattr(long_months[1], 'f'): # not a Lexeme: no inflection
-            return "{long_month}".format(long_month = long_months[month])
-        return self.FORMATS_long_month_year[inflect].format(
-                     long_month = long_months[month], year = '').rstrip()
-
-    def format_short_month(self, month, inflect, short_months):
-        if not hasattr(short_months[1], 'f'): # not a Lexeme: no inflection
-            return "{short_month}".format(short_month = short_months[month])
-        return self.FORMATS_short_month_year[inflect].format(
-                     short_month = short_months[month], year = '').rstrip()
-
-    def dd_dformat01(self, date_val):
-        """
-        numerical
-
-        this must agree with DateDisplayEn's "formats" definition
-        (it may be overridden if a locale-specific date displayer exists)
-        """
-        if date_val[3]:
-            return self.display_iso(date_val)
-        else:
-            if date_val[0] == date_val[1] == 0:
-                return str(date_val[2])
-            else:
-                value = self._tformat.replace('%m', str(date_val[1]))
-                if date_val[0] == 0: # ignore the zero day and its delimiter
-                    i_day = value.find('%d')
-                    value = value.replace(value[i_day:i_day+3], '')
-                value = value.replace('%d', str(date_val[0]))
-                value = value.replace('%Y', str(abs(date_val[2])))
-                return value.replace('-', '/')
-
-    def dd_dformat02(self, date_val, inflect, long_months):
-        """
-        month_name day, year
-
-        this must agree with DateDisplayEn's "formats" definition
-        (it may be overridden if a locale-specific date displayer exists)
-        """
-        _ = self._locale.translation.sgettext
+    def _display_gregorian(self, date_val):
+        # this one must agree with DateDisplayEn's "formats" definition
+        # (it may be overridden if a locale-specific date displayer exists)
        year = self._slash_year(date_val[2], date_val[3])
-        if date_val[0] == 0:
-            if date_val[1] == 0:
-                return year
-            else:
-                return self.format_long_month_year(date_val[1], year,
-                                                   inflect, long_months)
-        else:
-            # TRANSLATORS: this month is ALREADY inflected: ignore it
-            return _("{long_month} {day:d}, {year}").format(
-                       long_month = self.format_long_month(date_val[1],
-                                                           inflect,
-                                                           long_months),
-                       day = date_val[0],
-                       year = year)
-
-    def dd_dformat03(self, date_val, inflect, short_months):
-        """
-        month_abbreviation day, year
-
-        this must agree with DateDisplayEn's "formats" definition
-        (it may be overridden if a locale-specific date displayer exists)
-        """
-        _ = self._locale.translation.sgettext
-        year = self._slash_year(date_val[2], date_val[3])
-        if date_val[0] == 0:
-            if date_val[1] == 0:
-                return year
-            else:
-                return self.format_short_month_year(date_val[1], year,
-                                                    inflect, short_months)
-        else:
-            # TRANSLATORS: this month is ALREADY inflected: ignore it
-            return _("{short_month} {day:d}, {year}").format(
-                       short_month = self.format_short_month(date_val[1],
-                                                             inflect,
-                                                             short_months),
-                       day = date_val[0],
-                       year = year)
-
-    def dd_dformat04(self, date_val, inflect, long_months):
-        """
-        day month_name year
-
-        this must agree with DateDisplayEn's "formats" definition
-        (it may be overridden if a locale-specific date displayer exists)
-        """
-        _ = self._locale.translation.sgettext
-        year = self._slash_year(date_val[2], date_val[3])
-        if date_val[0] == 0:
-            if date_val[1] == 0:
-                return year
-            else:
-                return self.format_long_month_year(date_val[1], year,
-                                                   inflect, long_months)
-        else:
-            # TRANSLATORS: this month is ALREADY inflected: ignore it
-            return _("{day:d} {long_month} {year}").format(
-                       day = date_val[0],
-                       long_month = self.format_long_month(date_val[1],
-                                                           inflect,
-                                                           long_months),
-                       year = year)
-
-    def dd_dformat05(self, date_val, inflect, short_months):
-        """
-        day month_abbreviation year
-
-        this must agree with DateDisplayEn's "formats" definition
-        (it may be overridden if a locale-specific date displayer exists)
-        """
-        _ = self._locale.translation.sgettext
-        year = self._slash_year(date_val[2], date_val[3])
-        if date_val[0] == 0:
-            if date_val[1] == 0:
-                return year
-            else:
-                return self.format_short_month_year(date_val[1], year,
-                                                    inflect, short_months)
-        else:
-            # TRANSLATORS: this month is ALREADY inflected: ignore it
-            return _("{day:d} {short_month} {year}").format(
-                       day = date_val[0],
-                       short_month = self.format_short_month(date_val[1],
-                                                             inflect,
-                                                             short_months),
-                       year = year)
-
-    def _display_calendar(self, date_val, long_months, short_months = None,
-                          inflect=""):
-        """
-        this must agree with DateDisplayEn's "formats" definition
-        (it may be overridden if a locale-specific date displayer exists)
-        """
-
-        if short_months is None:
-            # Let the short formats work the same as long formats
-            short_months = long_months
-
        if self.format == 0:
            return self.display_iso(date_val)
        elif self.format == 1:
            # numerical
-            value = self.dd_dformat01(date_val)
+            if date_val[3]:
+                return self.display_iso(date_val)
+            else:
+                if date_val[0] == date_val[1] == 0:
+                    value = str(date_val[2])
+                else:
+                    value = self._tformat.replace('%m', str(date_val[1]))
+                    value = value.replace('%d', str(date_val[0]))
+                    value = value.replace('%Y', str(abs(date_val[2])))
+                    value = value.replace('-', '/')
        elif self.format == 2:
            # month_name day, year
-            value = self.dd_dformat02(date_val, inflect, long_months)
+            if date_val[0] == 0:
+                if date_val[1] == 0:
+                    value = year
+                else:
+                    value = "%s %s" % (self.long_months[date_val[1]], year)
+            else:
+                value = "%s %d, %s" % (self.long_months[date_val[1]], 
+                                       date_val[0], year)
        elif self.format == 3:
            # month_abbreviation day, year
-            value = self.dd_dformat03(date_val, inflect, short_months)
+            if date_val[0] == 0:
+                if date_val[1] == 0:
+                    value = year
+                else:
+                    value = "%s %s" % (self.short_months[date_val[1]], year)
+            else:
+                value = "%s %d, %s" % (self.short_months[date_val[1]], 
+                                       date_val[0], year)
        elif self.format == 4:
            # day month_name year
-            value = self.dd_dformat04(date_val, inflect, long_months)
+            if date_val[0] == 0:
+                if date_val[1] == 0:
+                    value = year
+                else:
+                    value = "%s %s" % (self.long_months[date_val[1]], year)
+            else:
+                value = "%d %s %s" % (date_val[0], 
+                                      self.long_months[date_val[1]], year)
        # elif self.format == 5:
        else:
            # day month_abbreviation year
-            value = self.dd_dformat05(date_val, inflect, short_months)
+            if date_val[0] == 0:
+                if date_val[1] == 0:
+                    value = year
+                else:
+                    value = "%s %s" % (self.short_months[date_val[1]], year)
+            else:
+                value = "%d %s %s" % (date_val[0], 
+                                      self.short_months[date_val[1]], year)
        if date_val[2] < 0:
-            # TODO fix BUG 7064: non-Gregorian calendars wrongly use BCE notation for negative dates
            return self._bce_str % value
        else:
            return value

+    def _display_julian(self, date_val):
+        # Julian date display is the same as Gregorian
+        return self._display_gregorian(date_val)

-    def _display_french(self, date_val, **kwargs):
-        return self._display_calendar(date_val, self.french, **kwargs)
+    def _display_calendar(self, date_val, month_list):
+        # used to display non-Gregorian calendars (Hebrew, Islamic, etc.)
+        year = abs(date_val[2])
+        if self.format == 0 or self.format == 1:
+            return self.display_iso(date_val)
+        else:
+            if date_val[0] == 0:
+                if date_val[1] == 0:
+                    value = year
+                else:
+                    value = "%s %d" % (month_list[date_val[1]], year)
+            else:
+                value = "%s %d, %s" % (month_list[date_val[1]], date_val[0], 
+                                        year)
+        if date_val[2] < 0:
+            return self._bce_str % value
+        else:
+            return value

-    def _display_hebrew(self, date_val, **kwargs):
-        return self._display_calendar(date_val, self.hebrew, **kwargs)
+    def _display_french(self, date_val):
+        year = abs(date_val[2])
+        if self.format == 0 or self.format == 1:
+            return self.display_iso(date_val)
+        else:
+            if date_val[0] == 0:
+                if date_val[1] == 0:
+                    value = year
+                else:
+                    value = "%s %d" % (self.french[date_val[1]], year)
+            else:
+                value = "%d %s %s" % (date_val[0], self.french[date_val[1]], 
+                                       year)
+        if date_val[2] < 0:
+            return self._bce_str % value
+        else:
+            return value

-    def _display_persian(self, date_val, **kwargs):
-        return self._display_calendar(date_val, self.persian, **kwargs)
+    def _display_hebrew(self, date_val):
+        return self._display_calendar(date_val, self.hebrew)

-    def _display_islamic(self, date_val, **kwargs):
-        return self._display_calendar(date_val, self.islamic, **kwargs)
+    def _display_persian(self, date_val):
+        return self._display_calendar(date_val, self.persian)
+
+    def _display_islamic(self, date_val):
+        return self._display_calendar(date_val, self.islamic)
+
+    def _display_swedish(self, date_val):
+        return self._display_calendar(date_val, self.swedish)

 class DateDisplayEn(DateDisplay):
    """
    English language date display class. 
    """

+    formats = (
+        "YYYY-MM-DD (ISO)", "Numerical", "Month Day, Year", 
+        "MON DAY, YEAR", "Day Month Year", "DAY MON YEAR"
+        )
+    # this (English) "formats" must agree with "_display_gregorian" (above)

    def __init__(self, format=None):
        """
@@ -629,6 +355,33 @@ class DateDisplayEn(DateDisplay):

        DateDisplay.__init__(self, format)

-    display = DateDisplay.display_formatted
+    def display(self, date):
+        """
+        Return a text string representing the date.
+        """
+        mod = date.get_modifier()
+        cal = date.get_calendar()
+        qual = date.get_quality()
+        start = date.get_start_date()
+        newyear = date.get_new_year()

-    _locale = DateDisplay._locale # normally set in register_datehandler
+        qual_str = self._qual_str[qual]
+        
+        if mod == Date.MOD_TEXTONLY:
+            return date.get_text()
+        elif start == Date.EMPTY:
+            return ""
+        elif mod == Date.MOD_SPAN:
+            d1 = self.display_cal[cal](start)
+            d2 = self.display_cal[cal](date.get_stop_date())
+            scal = self.format_extras(cal, newyear)
+            return "%sfrom %s to %s%s" % (qual_str, d1, d2, scal)
+        elif mod == Date.MOD_RANGE:
+            d1 = self.display_cal[cal](start)
+            d2 = self.display_cal[cal](date.get_stop_date())
+            scal = self.format_extras(cal, newyear)
+            return "%sbetween %s and %s%s" % (qual_str, d1, d2, scal)
+        else:
+            text = self.display_cal[date.get_calendar()](start)
+            scal = self.format_extras(cal, newyear)
+            return "%s%s%s%s" % (qual_str, self._mod_str[mod], text, scal)
@@ -18,6 +18,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

+# $Id$
+
 """
 Class handling language-specific selection for date parser and displayer.
 """
@@ -47,7 +49,6 @@ from ._dateparser import DateParser
 from ._datedisplay import DateDisplay, DateDisplayEn
 from ..constfunc import win, cuni
 from ..const import GRAMPS_LOCALE as glocale
-from gramps.gen.utils.grampslocale import GrampsLocale

 #-------------------------------------------------------------------------
 #
@@ -98,20 +99,15 @@ def register_datehandler(locales,parse_class,display_class):
    Registers the passed date parser class and date displayer
    classes with the specified language locales.

-    Set the parser_class and display_class ._locale attribute
-    to the corresponding :class:`.GrampsLocale` object.
-
-    :param locales: tuple of strings containing language codes.
-                    The character encoding is not included, so the language
-                    should be in the form of fr_FR, not fr_FR.utf8
-    :type locales: tuple
-    :param parse_class: Class to be associated with parsing
-    :type parse_class: :class:`.DateParser`
-    :param display_class: Class to be associated with displaying
-    :type display_class: :class:`.DateDisplay`
+    @param locales: tuple of strings containing language codes.
+        The character encoding is not included, so the language
+        should be in the form of fr_FR, not fr_FR.utf8
+    @type locales: tuple
+    @param parse_class: Class to be associated with parsing
+    @type parse_class: DateParse
+    @param display_class: Class to be associated with displaying
+    @type display_class: DateDisplay
    """
    for lang_str in locales:
        LANG_TO_PARSER[lang_str] = parse_class
        LANG_TO_DISPLAY[lang_str] = display_class
-
-    parse_class._locale = display_class._locale = GrampsLocale(lang=locales[0])
@@ -19,6 +19,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

+# $Id$
+
 """
 Date parsing class. Serves as the base class for any localized
 date parsing class. The default base class provides parsing for English.
@@ -47,10 +49,8 @@ log = logging.getLogger(".DateParser")
 # GRAMPS modules
 #
 #-------------------------------------------------------------------------
-from ..lib.date import Date, DateError, Today
+from ..lib.date import Date, DateError
 from . import _grampslocale
-from ..utils.grampslocale import GrampsLocale
-from ._datestrings import DateStrings

 #-------------------------------------------------------------------------
 #
@@ -120,69 +120,6 @@ def french_valid(date_tuple):
        valid = False       
    return valid

-def _build_prefix_table(month_to_int, month_variants):
-    """
-    Populate a DateParser.month_to_int-like dict
-    with all the prefixes found in month_variants.
-    """
-
-    month_variants = list(month_variants) # drain the generator, if any
-    month_to_int_new = {}
-
-    # Populate with full names first, w/o prefixes
-    log.debug("Mapping full names...")
-    for i in range(0,len(month_variants)):
-        for month in month_variants[i]:
-            m = month.lower()
-            log.debug("Mapping {} -> {}".format(m, i))
-            month_to_int_new[m] = i
-    month_to_int.update(month_to_int_new)
-
-    log.debug("Mapping new prefixes...")
-    months_sorted = list(month_to_int_new.keys())
-    months_sorted.sort(key=len, reverse=True)
-    for m in months_sorted:
-        for prefixlen in reversed(range(1,len(m))):
-            mp = m[:prefixlen]
-            if mp.strip() != mp:
-                continue
-            if mp in month_to_int:
-                break
-            else:
-                i = month_to_int[m]
-                log.debug("Mapping {} -> {}".format(mp, i))
-                month_to_int[mp] = i
-
-def _generate_variants(months):
-    """
-    Generate all month variants for passing to _build_prefix_table
-    :param months: an iterable ordered collection, 1st item is empty, the rest
-                   1..N, for a calendar with N months overall, contain, each,
-                   an iterable of alternative specifications.
-                   Each such specification can be:
-                     1) a Lexeme, supporting .variants() to return the list of
-                        variants underneath
-                     2) a literal string
-                     3) a |-separated string of alternatives
-                   Empty strings are discarded.
-    :return: generator of lists per month with all variants listed once only
-             the 1st item will be empty
-    """
-
-    for month_lexemes_and_alternatives in months:
-        v = []
-        for m in month_lexemes_and_alternatives:
-            try:
-                # Lexeme? ask it to compute the variants it knows
-                mv = list(m.variants())
-            except AttributeError:
-                # plain string, not a lexeme with inflections...
-                # Maybe a '|'-separated list of alternatives, maybe empty,
-                # maybe a single string. Suppress empty strings!
-                mv = (s for s in m.split('|') if s)
-            v.extend(mv)
-        yield(list(set(v)))
-
 #-------------------------------------------------------------------------
 #
 # DateParser class
@@ -190,12 +127,10 @@ def _generate_variants(months):
 #-------------------------------------------------------------------------
 class DateParser(object):
    """
-    Convert a text string into a :class:`.Date` object. If the date cannot be
+    Convert a text string into a Date object. If the date cannot be
    converted, the text string is assigned.
    """

-    _locale = GrampsLocale(lang='en', languages='en')
-    
    _fmt_parse = re.compile(".*%(\S).*%(\S).*%(\S).*")

    # RFC-2822 only uses capitalized English abbreviated names, no locales.
@@ -206,12 +141,7 @@ class DateParser(object):
        'Sep' : 9,  'Oct' : 10, 'Nov' : 11, 'Dec' : 12,
        }

-    # seeded with __init_prefix_tables
-    swedish_to_int = month_to_int = {}
-    """
-    Map Gregorian month names and their prefixes, wherever unambiguous,
-    to the relevant integer index (1..12).
-    """
+    month_to_int = _grampslocale.month_to_int

    # modifiers before the date
    # (overridden if a locale-specific date parser exists)
@@ -242,7 +172,13 @@ class DateParser(object):
        }

    french_to_int = {
-# the long ones are seeded with __init_prefix_tables
+        'vendémiaire'  : 1,    'brumaire'   : 2,
+        'frimaire'     : 3,    'nivôse': 4,
+        'pluviôse'     : 5,    'ventôse' : 6,
+        'germinal'     : 7,    'floréal' : 8,
+        'prairial'     : 9,    'messidor'   : 10,
+        'thermidor'    : 11,   'fructidor'  : 12,
+        'extra'        : 13,
        #GEDCOM months
        'vend'    : 1,    'brum' : 2,
        'frim'    : 3,    'nivo' : 4,
@@ -254,8 +190,6 @@ class DateParser(object):
        }

    islamic_to_int = {
-# some are already seeded with __init_prefix_tables,
-# but it is a pain to separate them out from the variants...
        "muharram"           : 1,  "muharram ul haram"  : 1,
        "safar"              : 2,  "rabi`al-awwal"      : 3,
        "rabi'l"             : 3,  "rabi`ul-akhir"      : 4,
@@ -273,14 +207,44 @@ class DateParser(object):
        "dhu hijja"          : 12, "thw al-hijjah"      : 12,
        }

-    # seeded with __init_prefix_tables
-    persian_to_int = { }
+    persian_to_int = {
+        "farvardin"   : 1,  "ordibehesht" : 2,
+        "khordad"     : 3,  "tir"         : 4,
+        "mordad"      : 5,  "shahrivar"   : 6,
+        "mehr"        : 7,  "aban"        : 8,
+        "azar"        : 9,  "dey"         : 10,
+        "bahman"      : 11, "esfand"      : 12,
+        }
+
+    swedish_to_int = {
+        "januari"    :  1, "februari"   :  2,
+        "mars"       :  3, "april"      :  4,
+        "maj"        :  5, "juni"       :  6,
+        "juli"       :  7, "augusti"    :  8,
+        "september"  :  9, "oktober"    : 10,
+        "november"   : 11, "december"   : 12,
+        }
+        

    bce = ["B.C.E.", "B.C.E", "BCE", "B.C.", "B.C", "BC" ]
    # (overridden if a locale-specific date parser exists)

-    # seeded with __init_prefix_tables
    calendar_to_int = {
+        'gregorian'        : Date.CAL_GREGORIAN,
+        'g'                : Date.CAL_GREGORIAN,
+        'julian'           : Date.CAL_JULIAN,
+        'j'                : Date.CAL_JULIAN,
+        'hebrew'           : Date.CAL_HEBREW,
+        'h'                : Date.CAL_HEBREW,
+        'islamic'          : Date.CAL_ISLAMIC,
+        'i'                : Date.CAL_ISLAMIC,
+        'french'           : Date.CAL_FRENCH,
+        'french republican': Date.CAL_FRENCH,
+        'f'                : Date.CAL_FRENCH,
+        'persian'          : Date.CAL_PERSIAN,
+        'p'                : Date.CAL_PERSIAN, 
+        'swedish'          : Date.CAL_SWEDISH,
+        's'                : Date.CAL_SWEDISH,
        }
        # (probably overridden if a locale-specific date parser exists)

@@ -300,39 +264,7 @@ class DateParser(object):
        'calculated' : Date.QUAL_CALCULATED,
        }
        # (overridden if a locale-specific date parser exists)
-
-    today = ["$T",]
-        # Override with a list of *synonyms* for "today" in your language.
-        # Note: the word "today" itself will already be pulled in from your translation DB,
-        # see init_strings, so there is no need to override this if you have no aliases
-        # for "today".
-        # We also secretly support "$T" like in some reports.
    
-    _langs = set()
-    def __init_prefix_tables(self):
-        lang = self._locale.lang
-        if lang in DateParser._langs:
-            log.debug("Prefix tables for {} already built".format(lang))
-            return
-        else:
-            DateParser._langs.add(lang)
-        ds = DateStrings(self._locale)
-        log.debug("Begin building parser prefix tables for {}".format(lang))
-        _build_prefix_table(DateParser.month_to_int, 
-            _generate_variants(
-                    zip(ds.long_months, ds.short_months, 
-                        ds.swedish_SV, ds.alt_long_months)))
-        _build_prefix_table(DateParser.hebrew_to_int,
-            _generate_variants(zip(ds.hebrew)))
-        _build_prefix_table(DateParser.french_to_int,
-            _generate_variants(zip(ds.french)))
-        _build_prefix_table(DateParser.islamic_to_int,
-            _generate_variants(zip(ds.islamic)))
-        _build_prefix_table(DateParser.persian_to_int,
-            _generate_variants(zip(ds.persian)))
-        _build_prefix_table(DateParser.calendar_to_int,
-                _generate_variants(zip(ds.calendar)))
-
    def __init__(self):
        self.init_strings()
        self.parser = {
@@ -362,8 +294,8 @@ class DateParser(object):
        sorted so that longest keys match first.  Any '.' characters
        are quoted.
        """
-        keys.sort(key=len, reverse=True)
-        return '(' + '|'.join([re.escape(key) for key in keys]) + ')'
+        keys.sort(key=lambda x: len(x), reverse=True)
+        return '(' + '|'.join([key.replace('.', '\.') for key in keys]) + ')'

    def init_strings(self):
        """
@@ -374,13 +306,8 @@ class DateParser(object):
        may be called first as DateParser.init_strings(self) so that the
        invariant expresions don't need to be repeteadly coded. All differences
        can be coded after DateParser.init_strings(self) call, that way they
-        override stuff from this method.
-        
-        .. seealso:: :class:`.DateParserRU` as an example.
+        override stuff from this method. See DateParserRU() as an example.
        """
-        _ = self._locale.translation.gettext
-        self.__init_prefix_tables()
-
        self._rfc_mon_str  = '(' + '|'.join(list(self._rfc_mons_to_int.keys())) + ')'
        self._rfc_day_str  = '(' + '|'.join(self._rfc_days) + ')'

@@ -399,8 +326,6 @@ class DateParser(object):
        self._cal_str  = self.re_longest_first(list(self.calendar_to_int.keys()))
        self._ny_str   = self.re_longest_first(list(self.newyear_to_int.keys()))

-        self._today_str = self.re_longest_first(self.today + [_("today"),])
-
        # bce, calendar type and quality may be either at the end or at
        # the beginning of the given date string, therefore they will
        # be parsed from the middle and will be in match.group(2).
@@ -459,7 +384,6 @@ class DateParser(object):
        self._isotimestamp = re.compile("^\s*?(\d{4})([01]\d)([0123]\d)(?:(?:[012]\d[0-5]\d[0-5]\d)|(?:\s+[012]\d:[0-5]\d(?::[0-5]\d)?))?\s*?$")
        self._rfc      = re.compile("(%s,)?\s+(\d|\d\d)\s+%s\s+(\d+)\s+\d\d:\d\d(:\d\d)?\s+(\+|-)\d\d\d\d" 
                                    % (self._rfc_day_str, self._rfc_mon_str))
-        self._today = re.compile("^\s*%s\s*$" % self._today_str, re.IGNORECASE)

    def _get_int(self, val):
        """
@@ -552,7 +476,7 @@ class DateParser(object):
        
        return Date.EMPTY
    
-    def _parse_subdate(self, text, subparser=None, cal=None):
+    def _parse_subdate(self, text, subparser=None):
        """
        Convert only the date portion of a date.
        """
@@ -629,12 +553,8 @@ class DateParser(object):
            else:
                y = self._get_int(groups[4])
                if self.dmy:
-                    if groups[3] is None:
-                        m = self._get_int(groups[1])
-                        d = 0
-                    else:
-                        m = self._get_int(groups[3])
-                        d = self._get_int(groups[1])
+                    m = self._get_int(groups[3])
+                    d = self._get_int(groups[1])
                else:
                    m = self._get_int(groups[1])
                    d = self._get_int(groups[3])
@@ -642,14 +562,7 @@ class DateParser(object):
            if check and not check((d, m, y)):
                value = Date.EMPTY
            return value
-
-        match = self._today.match(text)
-        if match:
-            today = Today()
-            if cal:
-                today = today.to_calendar(cal)
-            return today.get_dmy(get_slash=True)
-
+        
        return Date.EMPTY

    def match_calendar(self, text, cal):
@@ -722,14 +635,14 @@ class DateParser(object):
        if match:
            text_parser = self.parser[cal]
            (text1, bc1) = self.match_bce(match.group('start'))
-            start = self._parse_subdate(text1, text_parser, cal)
+            start = self._parse_subdate(text1, text_parser)
            if start == Date.EMPTY and text1 != "":
                return 0
            if bc1:
                start = self.invert_year(start)

            (text2, bc2) = self.match_bce(match.group('stop'))
-            stop = self._parse_subdate(text2, text_parser, cal)
+            stop = self._parse_subdate(text2, text_parser)
            if stop == Date.EMPTY and text2 != "":
                return 0
            if bc2:
@@ -749,14 +662,14 @@ class DateParser(object):
        if match:
            text_parser = self.parser[cal]
            (text1, bc1) = self.match_bce(match.group('start'))
-            start = self._parse_subdate(text1, text_parser, cal)
+            start = self._parse_subdate(text1, text_parser)
            if start == Date.EMPTY and text1 != "":
                return 0
            if bc1:
                start = self.invert_year(start)

            (text2, bc2) = self.match_bce(match.group('stop'))
-            stop = self._parse_subdate(text2, text_parser, cal)
+            stop = self._parse_subdate(text2, text_parser)
            if stop == Date.EMPTY and text2 != "":
                return 0
            if bc2:
@@ -793,7 +706,7 @@ class DateParser(object):
        match = self._modifier.match(text)
        if match:
            grps = match.groups()
-            start = self._parse_subdate(grps[1], self.parser[cal], cal)
+            start = self._parse_subdate(grps[1], self.parser[cal])
            mod = self.modifier_to_int.get(grps[0].lower(), Date.MOD_NONE)
            if start == Date.EMPTY:
                date.set_modifier(Date.MOD_TEXTONLY)
@@ -808,7 +721,7 @@ class DateParser(object):
            match = self._modifier_after.match(text)
            if match:
                grps = match.groups()
-                start = self._parse_subdate(grps[0], self.parser[cal], cal)
+                start = self._parse_subdate(grps[0], self.parser[cal])
                mod = self.modifier_after_to_int.get(grps[1].lower(),
                                                     Date.MOD_NONE)
                if start == Date.EMPTY:
@@ -822,7 +735,7 @@ class DateParser(object):
        match = self._abt2.match(text)
        if match:
            grps = match.groups()
-            start = self._parse_subdate(grps[0], cal=cal)
+            start = self._parse_subdate(grps[0])
            mod = Date.MOD_ABOUT
            if start == Date.EMPTY:
                date.set_modifier(Date.MOD_TEXTONLY)
@@ -859,7 +772,7 @@ class DateParser(object):
            return

        try:
-            subdate = self._parse_subdate(text, self.parser[cal], cal)
+            subdate = self._parse_subdate(text, self.parser[cal])
            if subdate == Date.EMPTY and text != "":
                date.set_as_text(text)
                return
@@ -879,7 +792,7 @@ class DateParser(object):
    
    def parse(self, text):
        """
-        Parses the text, returning a :class:`.Date` object.
+        Parses the text, returning a Date object.
        """
        new_date = Date()
        try:
@@ -1,357 +0,0 @@
-# -*- coding: utf-8 -*- 
-#
-# Gramps - a GTK+/GNOME based genealogy program
-#
-# Copyright (C) 2013  Vassilii Khachaturov
-#
-# 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-
-"""
-Date strings to translate per each language for display and parsing.
-"""
-from __future__ import print_function, unicode_literals
-
-#-------------------------------------------------------------------------
-#
-# set up logging
-#
-#-------------------------------------------------------------------------
-import logging
-log = logging.getLogger(".DateStrings")
-
-#-------------------------------------------------------------------------
-#
-# DateStrings
-#
-#-------------------------------------------------------------------------
-class DateStrings(object):
-    """
-    String tables for :class:`.DateDisplay` and :class:`.DateParser`.
-    """
-
-    # This table needs not be localized, it's only for parsing 
-    # Swedish calendar dates using Swedish month names.
-    # Display of these months uses the regular long_months.
-    # TODO should we pack these into alt_long_months instead?
-    swedish_SV = (
-        "", "Januari", "Februari", "Mars",
-        "April", "Maj", "Juni",
-        "Juli", "Augusti", "September",
-        "Oktober", "November", "December"
-        )
-
-
-    def __init__(self, locale):
-        _ = locale.translation.lexgettext
-
-        self.long_months = ( "",
-            # TRANSLATORS: see 
-            # http://gramps-project.org/wiki/index.php?title=Translating_Gramps#Translating_dates
-            # to learn how to select proper inflection to be used in your localized
-            # DateDisplayer code!
-            _("localized lexeme inflections||January"), 
-            _("localized lexeme inflections||February"), 
-            _("localized lexeme inflections||March"), 
-            _("localized lexeme inflections||April"), 
-            _("localized lexeme inflections||May"), 
-            _("localized lexeme inflections||June"), 
-            _("localized lexeme inflections||July"), 
-            _("localized lexeme inflections||August"), 
-            _("localized lexeme inflections||September"), 
-            _("localized lexeme inflections||October"), 
-            _("localized lexeme inflections||November"), 
-            _("localized lexeme inflections||December") )
-
-        self.short_months = ( "",
-            # TRANSLATORS: see 
-            # http://gramps-project.org/wiki/index.php?title=Translating_Gramps#Translating_dates
-            # to learn how to select proper inflection to be used in your localized
-            # DateDisplayer code!
-            _("localized lexeme inflections - short month form||Jan"), 
-            _("localized lexeme inflections - short month form||Feb"), 
-            _("localized lexeme inflections - short month form||Mar"), 
-            _("localized lexeme inflections - short month form||Apr"), 
-            _("localized lexeme inflections - short month form||May"), 
-            _("localized lexeme inflections - short month form||Jun"), 
-            _("localized lexeme inflections - short month form||Jul"), 
-            _("localized lexeme inflections - short month form||Aug"), 
-            _("localized lexeme inflections - short month form||Sep"), 
-            _("localized lexeme inflections - short month form||Oct"), 
-            _("localized lexeme inflections - short month form||Nov"), 
-            _("localized lexeme inflections - short month form||Dec") )
-
-        _ = locale.translation.sgettext
-        self.alt_long_months = ( "",
-            # TRANSLATORS: see 
-            # http://gramps-project.org/wiki/index.php?title=Translating_Gramps#Translating_dates
-            # to learn how to add proper alternatives to be recognized in your localized
-            # DateParser code!
-            _("alternative month names for January||"), 
-            _("alternative month names for February||"), 
-            _("alternative month names for March||"), 
-            _("alternative month names for April||"), 
-            _("alternative month names for May||"), 
-            _("alternative month names for June||"), 
-            _("alternative month names for July||"), 
-            _("alternative month names for August||"), 
-            _("alternative month names for September||"), 
-            _("alternative month names for October||"), 
-            _("alternative month names for November||"), 
-            _("alternative month names for December||") )
-
-        self.calendar = (
-# Must appear in the order indexed by Date.CAL_... numeric constants
-                _("calendar|Gregorian"), 
-                _("calendar|Julian"), 
-                _("calendar|Hebrew"), 
-                _("calendar|French Republican"), 
-                _("calendar|Persian"), 
-                _("calendar|Islamic"),
-                _("calendar|Swedish") )
-        _ = locale.translation.lexgettext
-
-        self.hebrew = (
-            "", 
-            # TRANSLATORS: see 
-            # http://gramps-project.org/wiki/index.php?title=Translating_Gramps#Translating_dates
-            # to learn how to select proper inflection to be used in your localized
-            # DateDisplayer code!
-            _("Hebrew month lexeme|Tishri"), 
-            _("Hebrew month lexeme|Heshvan"), 
-            _("Hebrew month lexeme|Kislev"), 
-            _("Hebrew month lexeme|Tevet"), 
-            _("Hebrew month lexeme|Shevat"), 
-            _("Hebrew month lexeme|AdarI"), 
-            _("Hebrew month lexeme|AdarII"), 
-            _("Hebrew month lexeme|Nisan"), 
-            _("Hebrew month lexeme|Iyyar"), 
-            _("Hebrew month lexeme|Sivan"), 
-            _("Hebrew month lexeme|Tammuz"), 
-            _("Hebrew month lexeme|Av"), 
-            _("Hebrew month lexeme|Elul")
-            )
-
-        self.french = (
-            "", 
-            # TRANSLATORS: see 
-            # http://gramps-project.org/wiki/index.php?title=Translating_Gramps#Translating_dates
-            # to learn how to select proper inflection to be used in your localized
-            # DateDisplayer code!
-            _("French month lexeme|Vendémiaire"), 
-            _("French month lexeme|Brumaire"), 
-            _("French month lexeme|Frimaire"), 
-            _("French month lexeme|Nivôse"), 
-            _("French month lexeme|Pluviôse"), 
-            _("French month lexeme|Ventôse"), 
-            _("French month lexeme|Germinal"), 
-            _("French month lexeme|Floréal"), 
-            _("French month lexeme|Prairial"), 
-            _("French month lexeme|Messidor"), 
-            _("French month lexeme|Thermidor"), 
-            _("French month lexeme|Fructidor"), 
-            _("French month lexeme|Extra"), 
-            )
-
-        self.islamic = (
-            "", 
-            # TRANSLATORS: see 
-            # http://gramps-project.org/wiki/index.php?title=Translating_Gramps#Translating_dates
-            # to learn how to select proper inflection to be used in your localized
-            # DateDisplayer code!
-            _("Islamic month lexeme|Muharram"), 
-            _("Islamic month lexeme|Safar"), 
-            _("Islamic month lexeme|Rabi`al-Awwal"), 
-            _("Islamic month lexeme|Rabi`ath-Thani"), 
-            _("Islamic month lexeme|Jumada l-Ula"), 
-            _("Islamic month lexeme|Jumada t-Tania"), 
-            _("Islamic month lexeme|Rajab"), 
-            _("Islamic month lexeme|Sha`ban"), 
-            _("Islamic month lexeme|Ramadan"), 
-            _("Islamic month lexeme|Shawwal"), 
-            _("Islamic month lexeme|Dhu l-Qa`da"), 
-            _("Islamic month lexeme|Dhu l-Hijja"),
-            )
-
-        self.persian = (
-            "", 
-            # TRANSLATORS: see 
-            # http://gramps-project.org/wiki/index.php?title=Translating_Gramps#Translating_dates
-            # to learn how to select proper inflection to be used in your localized
-            # DateDisplayer code!
-            _("Persian month lexeme|Farvardin"), 
-            _("Persian month lexeme|Ordibehesht"), 
-            _("Persian month lexeme|Khordad"), 
-            _("Persian month lexeme|Tir"), 
-            _("Persian month lexeme|Mordad"), 
-            _("Persian month lexeme|Shahrivar"), 
-            _("Persian month lexeme|Mehr"), 
-            _("Persian month lexeme|Aban"), 
-            _("Persian month lexeme|Azar"), 
-            _("Persian month lexeme|Dey"), 
-            _("Persian month lexeme|Bahman"), 
-            _("Persian month lexeme|Esfand"),
-            )
-
-        self.modifiers = ("", 
-                _("date modifier|before "), 
-                _("date modifier|after "), 
-                _("date modifier|about "), 
-                "", "", "")
-
-        self.qualifiers = ("", 
-                _("date quality|estimated "), 
-                _("date quality|calculated "), 
-                )
-
-        # 6753: localized day names. Eventually should sprout into 
-        # a per-calendar type thing instead.
-        self.long_days = ("",
-                _("Sunday"),
-                _("Monday"),
-                _("Tuesday"),
-                _("Wednesday"),
-                _("Thursday"),
-                _("Friday"),
-                _("Saturday"),
-            )
-
-__doc__ += """
-__main__
--------
-
-Run this code with the appropriate ``LANG`` and ``LC_DATE`` set for your target
-language, in order to generate the .po snippets initialized with the strings
-from your locale (from the deprecated data provided in _grampslocale).
-
-E.g., for French::
-
-    LANG=fr_FR.utf8 LC_ALL=fr_FR.utf8 GRAMPS_RESOURCES=$PWD python -m gramps.gen.datehandler._datestrings
-
-Then merge the output into your language's .po file, and further modify the
-strings as needed. Then remove the strings from your language's
-:class:`DateParserXX` and :class:`DateHandlerXX` classes.
-"""
-
-if __name__ == '__main__':
-    import sys
-    from ..utils.grampslocale import GrampsLocale
-    from gramps.gen.const import GRAMPS_LOCALE as glocale
-    from ._grampslocale import (_deprecated_long_months as old_long, 
-            _deprecated_short_months as old_short,
-            _deprecated_long_days as old_days)
-    from ._datedisplay import DateDisplay
-    import gettext
-    lang = glocale.lang
-    lang_short = lang[:2]
-    available_langs = glocale.get_available_translations()
-    if glocale.check_available_translations(lang) is None:
-        print ("Translation for current language {lang} not available.\n" 
-                "Available translations: {list}.\n"
-                "Does po/{lang_short}*.po exist in gramps source tree?!\n"
-                "Please set your LANG / LC_ALL environment to something else...\n".format(
-                    lang=lang, list=available_langs, lang_short=lang_short), 
-                file=sys.stderr)
-        sys.exit(1)
-
-    print ("# Generating snippets for {}*.po\n"
-            "# Available languages: {}".format(
-                    lang_short, available_langs))
-    glocale = GrampsLocale(languages=(lang))
-    dd = glocale.date_displayer
-    ds = dd._ds
-    glocale_EN = GrampsLocale(languages=('en'))
-    ds_EN = DateStrings(glocale_EN)
-
-    filename = __file__
-
-    try:
-        localized_months = dd.__class__.long_months
-    except AttributeError:
-        localized_months = old_long
-
-    def print_po_snippet(en_loc_old_lists, context):
-        for m,localized,old in zip(*en_loc_old_lists):
-            if m == "":
-                continue
-            if m == localized:
-                localized = old
-            print ('#: {file}:{line}\n'
-                   'msgid "{context}{en_month}"\n'
-                   'msgstr "{localized_month}"\n'.format(
-                       context = context,
-                       file = filename,
-                       line = print_po_snippet.line,
-                       en_month = m,
-                       localized_month = localized))
-            print_po_snippet.line += 1
-    print_po_snippet.line = 10000
-
-    try:
-        localized_months = dd.__class__.long_months
-    except AttributeError:
-        localized_months = old_long
-    print_po_snippet((ds_EN.long_months, localized_months, old_long),
-            "localized lexeme inflections||")
-    try:
-        localized_months = dd.__class__.short_months
-    except AttributeError:
-        localized_months = old_short
-    print_po_snippet((ds_EN.short_months, localized_months, old_short),
-            "localized lexeme inflections - short month form||")
-
-    try:
-        loc = dd.__class__.hebrew
-        print_po_snippet((ds_EN.hebrew, loc, loc),
-                "Hebrew month lexeme|")
-    except AttributeError:
-        pass
-
-    try:
-        loc = dd.__class__.french
-        print_po_snippet((ds_EN.french, loc, loc),
-                "French month lexeme|")
-    except AttributeError:
-        pass
-
-    try:
-        loc = dd.__class__.islamic
-        print_po_snippet((ds_EN.islamic, loc, loc),
-                "Islamic month lexeme|")
-    except AttributeError:
-        pass
-
-    try:
-        loc = dd.__class__.persian
-        print_po_snippet((ds_EN.persian, loc, loc),
-                "Persian month lexeme|")
-    except AttributeError:
-        pass
-
-    try:
-        loc = dd.__class__._mod_str
-        print_po_snippet((ds_EN.modifiers, loc, loc),
-                "date modifier|")
-    except AttributeError:
-        pass
-
-    try:
-        loc = dd.__class__._qual_str
-        print_po_snippet((ds_EN.qualifiers, loc, loc),
-                "date quality|")
-    except AttributeError:
-        pass
-
-    print_po_snippet((ds_EN.long_days, old_days, old_days), "")
@@ -18,6 +18,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

+# $Id$
+
 """
 Class handling language-specific selection for date parser and displayer.
 """
@@ -59,27 +61,27 @@ def set_format(value):

 def set_date(date_base, text) :
    """
-    Set the date of the :class:`.DateBase` instance.
+    Set the date of the DateBase instance.
    
-    The date is parsed into a :class:`.Date` instance.
+    The date is parsed into a Date instance.
+    
+    @param date_base: The DateBase instance to set the date to.
+    @type date_base: DateBase
+    @param text: The text to use for the text string in date
+    @type text: str
    
-    :param date_base: The :class:`.DateBase` instance to set the date to.
-    :type date_base: :class:`.DateBase`
-    :param text: The text to use for the text string in date
-    :type text: str
    """
    parser.set_date(date_base.get_date_object(), text)

 def get_date(date_base) :
    """
-    Return a string representation of the date of the :class:`.DateBase`
-    instance.
+    Return a string representation of the date of the DateBase instance.
    
    This representation is based off the default date display format
-    determined by the locale's :class:`.DateDisplay` instance.
-
-    :return: Returns a string representing the :class:`.DateBase` date
-    :rtype: str
+    determined by the locale's DateDisplay instance.
+    @return: Returns a string representing the DateBase date
+    @rtype: str
+    
    """
    return displayer.display(date_base.get_date_object())

@@ -19,6 +19,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
+# $Id$

 import locale
 import sys
@@ -45,8 +46,34 @@ codeset = glocale.encoding

 try:

-    # here only for the upgrade tool, see _datestrings.py __main__
-    _deprecated_long_months = (
+    month_to_int = {
+        to_uni(locale.nl_langinfo(locale.MON_1), codeset).lower()   : 1,
+        to_uni(locale.nl_langinfo(locale.ABMON_1), codeset).lower() : 1,
+        to_uni(locale.nl_langinfo(locale.MON_2), codeset).lower()   : 2,
+        to_uni(locale.nl_langinfo(locale.ABMON_2), codeset).lower() : 2,
+        to_uni(locale.nl_langinfo(locale.MON_3), codeset).lower()   : 3,
+        to_uni(locale.nl_langinfo(locale.ABMON_3), codeset).lower() : 3,
+        to_uni(locale.nl_langinfo(locale.MON_4), codeset).lower()   : 4,
+        to_uni(locale.nl_langinfo(locale.ABMON_4), codeset).lower() : 4,
+        to_uni(locale.nl_langinfo(locale.MON_5), codeset).lower()   : 5,
+        to_uni(locale.nl_langinfo(locale.ABMON_5), codeset).lower() : 5,
+        to_uni(locale.nl_langinfo(locale.MON_6), codeset).lower()   : 6,
+        to_uni(locale.nl_langinfo(locale.ABMON_6), codeset).lower() : 6,
+        to_uni(locale.nl_langinfo(locale.MON_7), codeset).lower()   : 7,
+        to_uni(locale.nl_langinfo(locale.ABMON_7), codeset).lower() : 7,
+        to_uni(locale.nl_langinfo(locale.MON_8), codeset).lower()   : 8,
+        to_uni(locale.nl_langinfo(locale.ABMON_8), codeset).lower() : 8,
+        to_uni(locale.nl_langinfo(locale.MON_9), codeset).lower()   : 9,
+        to_uni(locale.nl_langinfo(locale.ABMON_9), codeset).lower() : 9,
+        to_uni(locale.nl_langinfo(locale.MON_10), codeset).lower()  : 10,
+        to_uni(locale.nl_langinfo(locale.ABMON_10), codeset).lower(): 10,
+        to_uni(locale.nl_langinfo(locale.MON_11), codeset).lower()  : 11,
+        to_uni(locale.nl_langinfo(locale.ABMON_11), codeset).lower(): 11,
+        to_uni(locale.nl_langinfo(locale.MON_12), codeset).lower()  : 12,
+        to_uni(locale.nl_langinfo(locale.ABMON_12), codeset).lower(): 12,
+       }
+
+    long_months = (
        "",
        to_uni(locale.nl_langinfo(locale.MON_1), codeset),
        to_uni(locale.nl_langinfo(locale.MON_2), codeset),
@@ -62,7 +89,7 @@ try:
        to_uni(locale.nl_langinfo(locale.MON_12), codeset),
        )

-    _deprecated_short_months = (
+    short_months = (
        "",
        to_uni(locale.nl_langinfo(locale.ABMON_1), codeset),
        to_uni(locale.nl_langinfo(locale.ABMON_2), codeset),
@@ -84,7 +111,7 @@ try:
    #  not the international convention (ISO 8601) that Monday
    #  is the first day of the week."
    # see http://docs.python.org/library/locale.html
-    _deprecated_long_days = (
+    long_days = (
        "",
        to_uni(locale.nl_langinfo(locale.DAY_1), codeset), # Sunday
        to_uni(locale.nl_langinfo(locale.DAY_2), codeset), # Monday
@@ -95,7 +122,7 @@ try:
        to_uni(locale.nl_langinfo(locale.DAY_7), codeset), # Saturday
        )

-    _deprecated_short_days = (
+    short_days = (
        "",
        to_uni(locale.nl_langinfo(locale.ABDAY_1), codeset), # Sunday
        to_uni(locale.nl_langinfo(locale.ABDAY_2), codeset), # Monday
@@ -114,7 +141,34 @@ try:
 except:
    import time

-    _deprecated_long_months = (
+    month_to_int = {
+        to_uni(time.strftime('%B',(1,1,1,1,1,1,1,1,1)), codeset).lower() : 1,
+        to_uni(time.strftime('%b',(1,1,1,1,1,1,1,1,1)), codeset).lower() : 1,
+        to_uni(time.strftime('%B',(1,2,1,1,1,1,1,1,1)), codeset).lower() : 2,
+        to_uni(time.strftime('%b',(1,2,1,1,1,1,1,1,1)), codeset).lower() : 2,
+        to_uni(time.strftime('%B',(1,3,1,1,1,1,1,1,1)), codeset).lower() : 3,
+        to_uni(time.strftime('%b',(1,3,1,1,1,1,1,1,1)), codeset).lower() : 3,
+        to_uni(time.strftime('%B',(1,4,1,1,1,1,1,1,1)), codeset).lower() : 4,
+        to_uni(time.strftime('%b',(1,4,1,1,1,1,1,1,1)), codeset).lower() : 4,
+        to_uni(time.strftime('%B',(1,5,1,1,1,1,1,1,1)), codeset).lower() : 5,
+        to_uni(time.strftime('%b',(1,5,1,1,1,1,1,1,1)), codeset).lower() : 5,
+        to_uni(time.strftime('%B',(1,6,1,1,1,1,1,1,1)), codeset).lower() : 6,
+        to_uni(time.strftime('%b',(1,6,1,1,1,1,1,1,1)), codeset).lower() : 6,
+        to_uni(time.strftime('%B',(1,7,1,1,1,1,1,1,1)), codeset).lower() : 7,
+        to_uni(time.strftime('%b',(1,7,1,1,1,1,1,1,1)), codeset).lower() : 7,
+        to_uni(time.strftime('%B',(1,8,1,1,1,1,1,1,1)), codeset).lower() : 8,
+        to_uni(time.strftime('%b',(1,8,1,1,1,1,1,1,1)), codeset).lower() : 8,
+        to_uni(time.strftime('%B',(1,9,1,1,1,1,1,1,1)), codeset).lower() : 9,
+        to_uni(time.strftime('%b',(1,9,1,1,1,1,1,1,1)), codeset).lower() : 9,
+        to_uni(time.strftime('%B',(1,10,1,1,1,1,1,1,1)), codeset).lower() : 10,
+        to_uni(time.strftime('%b',(1,10,1,1,1,1,1,1,1)), codeset).lower() : 10,
+        to_uni(time.strftime('%B',(1,11,1,1,1,1,1,1,1)), codeset).lower() : 11,
+        to_uni(time.strftime('%b',(1,11,1,1,1,1,1,1,1)), codeset).lower() : 11,
+        to_uni(time.strftime('%B',(1,12,1,1,1,1,1,1,1)), codeset).lower() : 12,
+        to_uni(time.strftime('%b',(1,12,1,1,1,1,1,1,1)), codeset).lower() : 12,
+       }
+
+    long_months = (
        "",
        to_uni(time.strftime('%B',(1,1,1,1,1,1,1,1,1)), codeset),
        to_uni(time.strftime('%B',(1,2,1,1,1,1,1,1,1)), codeset),
@@ -130,7 +184,7 @@ except:
        to_uni(time.strftime('%B',(1,12,1,1,1,1,1,1,1)), codeset),
       )

-    _deprecated_short_months = (
+    short_months = (
        "",
        to_uni(time.strftime('%b',(1,1,1,1,1,1,1,1,1)), codeset),
        to_uni(time.strftime('%b',(1,2,1,1,1,1,1,1,1)), codeset),
@@ -155,7 +209,7 @@ except:
    # number. tm_wday => range [0,6], Monday is 0
    # Note. Only the seventh tuple entry matters. The others are
    # just a dummy.
-    _deprecated_long_days = (
+    long_days = (
        "",
        to_uni(time.strftime('%A',(1,1,1,1,1,1,6,1,1)), codeset), # Sunday
        to_uni(time.strftime('%A',(1,1,1,1,1,1,0,1,1)), codeset), # Monday
@@ -166,7 +220,7 @@ except:
        to_uni(time.strftime('%A',(1,1,1,1,1,1,5,1,1)), codeset), # Saturday
        )

-    _deprecated_short_days = (
+    short_days = (
        "",
        to_uni(time.strftime('%a',(1,1,1,1,1,1,6,1,1)), codeset), # Sunday
        to_uni(time.strftime('%a',(1,1,1,1,1,1,0,1,1)), codeset), # Monday
@@ -194,7 +248,6 @@ except:
        '10/25/2005' : '%m/%d/%Y',
        '2005/10/25' : '%Y/%m/%d',
        '25.10.2005' : '%d.%m.%Y',
-        '25.10.2005.' : '%d.%m.%Y.',
        '10.25.2005' : '%m.%d.%Y',
        '2005.10.25' : '%Y.%m.%d',
        }
@@ -1,117 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Gramps - a GTK+/GNOME based genealogy program
-#
-# Copyright (C) 2013       Vassilii Khachaturov
-#
-# 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-
-"""
-Deeper testing of some DateParser internals.
-"""
-
-from __future__ import print_function, unicode_literals
-import unittest
-
-from ...utils.grampslocale import GrampsLocale
-from ...lib.date import Date
-
-class DateDisplayTest(unittest.TestCase):
-    def setUp(self):
-        from .._datedisplay import DateDisplay
-        self.display = DateDisplay()
-        self.display_RU = GrampsLocale(lang='ru').date_displayer
-
-    def assert_map_key_val(self, m, k, v):
-        try:
-            self.assertEqual(m[k], v)
-        except KeyError:
-            self.assertTrue(False, list(m.items()))
-
-class DateDisplayCalendarTest(DateDisplayTest):
-    def test_calendar_gregorian_is_empty(self):
-        self.assert_map_key_val(self.display.calendar, Date.CAL_GREGORIAN, "")
-
-    def test_calendar_julian_RU(self):
-        self.assert_map_key_val(self.display_RU.calendar, Date.CAL_JULIAN, 'юлианский')
-
-# This class tests common functionality in DateDisplay as applied to RU,
-# and so it is coupled to translated strings and inflection names
-# extracted by lexgettext from ru.po
-class DateDisplayInflectionsTestRU(DateDisplayTest):
-    def setUp(self):
-        DateDisplayTest.setUp(self)
-        self.dd = self.display = self.display_RU
-        self.months = self.dd._ds.long_months
-        # TODO hardwired magic numbers! Bad API smell.
-        self.dd.set_format(4) # day month_name year 
-        self.may = self.months[5]
-
-    def assertInflectionInDate(self, inflection, date, month=None):
-        if month is None:
-            month = date.get_month()
-        month_lexeme = self.months[month]
-        self.assertIn(month_lexeme.f[inflection], 
-                self.dd.display(date))
-
-    def test_month_only_date_nominative(self):
-        for qual in (Date.QUAL_NONE, Date.QUAL_ESTIMATED, Date.QUAL_CALCULATED):
-            d1945may = Date(1945, 5, 0)
-            d1945may.set_quality(qual)
-            self.assertInflectionInDate('И', d1945may)
-
-    def test_day_month_date_genitive(self):
-        d1945may9 = Date(1945, 5, 9)
-        self.assertInflectionInDate('Р', d1945may9)
-
-    def test_before_month_only_date_genitive(self):
-        d1945may = Date(1945, 5, 0)
-        d1945may.set_modifier(Date.MOD_BEFORE)
-        # TODO hardwired magic numbers! Bad API smell.
-        for inflecting_format in (3,4):
-            self.dd.set_format(inflecting_format)
-# this depends on the fact that in Russian the short and long forms for May
-# will be the same!
-            self.assertIn("до мая", self.dd.display(d1945may))
-            
-    def test_between_month_only_dates_ablative(self):
-        b1945may_1946may = Date()
-        b1945may_1946may.set(
-                modifier=Date.MOD_RANGE, 
-                value=(0, 5, 1945, False, 0, 5, 1946, False))
-        # TODO hardwired magic numbers! Bad API smell.
-        for inflecting_format in (3,4):
-            self.dd.set_format(inflecting_format)
-# this depends on the fact that in Russian the short and long forms for May
-# will be the same!
-            self.assertIn("между маем", self.dd.display(b1945may_1946may))
-            self.assertIn("и маем", self.dd.display(b1945may_1946may))
-
-    def test_month_only_date_span_from_genitive_to_accusative(self):
-        f1945may_t1946may = Date()
-        f1945may_t1946may.set(
-                modifier=Date.MOD_SPAN, 
-                value=(0, 5, 1945, False, 0, 5, 1946, False))
-        # TODO hardwired magic numbers! Bad API smell.
-        for inflecting_format in (3,4):
-            self.dd.set_format(inflecting_format)
-# this depends on the fact that in Russian the short and long forms for May
-# will be the same!
-            self.assertIn("с мая", self.dd.display(f1945may_t1946may))
-            self.assertIn("по май", self.dd.display(f1945may_t1946may))
-
-if __name__ == "__main__":
-    unittest.main()
@@ -21,6 +21,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

+# $Id$
+
 """
 Validate localized date parser and displayer.

@@ -57,14 +59,20 @@ from .. import displayer as _dd
 #
 #-------------------------------------------------------------------------
 class DateHandlerTest(unittest.TestCase):
-    def base_test(self, test_date):
-        datestr = _dd.display(test_date)
-        new_date = _dp.parse(datestr)

-        self.assertTrue(test_date.is_equal(new_date),
-                "{} -> {}\n{} -> {}".format(
-                    test_date, new_date,
-                    test_date.to_struct(), new_date.to_struct()))
+    def base_test(self, test_date):
+        
+        try:
+            datestr = _dd.display(test_date)
+        except:
+            self.assertFail('Date displayer exception')
+
+        try:
+            new_date = _dp.parse(datestr)
+        except:
+            self.assertFail('Date parser exception')
+
+        self.assertTrue(test_date.is_equal(new_date))

    def test_simple(self):
        
@@ -1,126 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Gramps - a GTK+/GNOME based genealogy program
-#
-# Copyright (C) 2013       Vassilii Khachaturov
-#
-# 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-
-"""
-Deeper testing of some DateParser internals.
-"""
-
-from __future__ import print_function, unicode_literals
-import unittest
-
-from ...utils.grampslocale import GrampsLocale
-from ...lib.date import Date
-
-class DateParserTest(unittest.TestCase):
-    def setUp(self):
-        from .._dateparser import DateParser
-        self.parser = DateParser()
-        self.parser_RU = GrampsLocale(lang='ru').date_parser
-
-    def assert_map_key_val(self, m, k, v):
-        try:
-            self.assertEqual(m[k], v)
-        except KeyError:
-            self.assertTrue(False, list(m.items()))
-
-    def test_month_to_int_jan_is_1(self):
-        self.assert_map_key_val(self.parser.month_to_int, 'jan', 1)
-
-    def test_prefix_table_for_RU_built(self):
-        self.assertIn('ru_RU', self.parser._langs)
-
-    def test_month_to_int_septem_RU_is_9(self):
-        self.assert_map_key_val(self.parser.month_to_int, 'сентяб', 9)
-
-    def test_hebrew_to_int_av_is_12(self):
-        self.assert_map_key_val(self.parser.hebrew_to_int, 'av', 12)
-        self.assert_map_key_val(self.parser.hebrew_to_int, 'ав', 12) # RU
-
-    def test_french_to_int_thermidor_is_11(self):
-        self.assert_map_key_val(self.parser.french_to_int, 'thermidor', 11)
-        self.assert_map_key_val(self.parser.french_to_int, 'термидор', 11) # RU
-
-    def test_islamic_to_int_ramadan_is_9(self):
-        self.assert_map_key_val(self.parser.islamic_to_int, 'ramadan', 9)
-        self.assert_map_key_val(self.parser.islamic_to_int, 'рамадан', 9) # RU
-
-    def test_persian_to_int_tir_is_4(self):
-        self.assert_map_key_val(self.parser.persian_to_int, 'tir', 4)
-        self.assert_map_key_val(self.parser.persian_to_int, 'тир', 4) # RU
-
-    def test_calendar_to_int_gregorian(self):
-        self.assert_map_key_val(self.parser.calendar_to_int, 'gregorian', Date.CAL_GREGORIAN)
-        self.assert_map_key_val(self.parser.calendar_to_int, 'g', Date.CAL_GREGORIAN)
-        self.assert_map_key_val(self.parser.calendar_to_int, 'григорианский', Date.CAL_GREGORIAN)
-        self.assert_map_key_val(self.parser.calendar_to_int, 'г', Date.CAL_GREGORIAN)
-
-    def test_calendar_to_int_julian(self):
-        self.assert_map_key_val(self.parser.calendar_to_int, 'julian', Date.CAL_JULIAN)
-        self.assert_map_key_val(self.parser.calendar_to_int, 'j', Date.CAL_JULIAN)
-        self.assert_map_key_val(self.parser.calendar_to_int, 'юлианский', Date.CAL_JULIAN)
-        self.assert_map_key_val(self.parser.calendar_to_int, 'ю', Date.CAL_JULIAN)
-
-class Test_generate_variants(unittest.TestCase):
-    def setUp(self):
-        from .. import _datestrings
-        from .._dateparser import _generate_variants
-        self.ds = ds = _datestrings.DateStrings(GrampsLocale(languages=('ru')))
-        self.month_variants = list(_generate_variants(
-                    zip(ds.long_months, ds.short_months, 
-                        ds.swedish_SV, ds.alt_long_months)))
-
-    def testVariantsSameLengthAsLongMonths(self):
-        self.assertEqual(len(self.ds.long_months), 
-                len(self.month_variants))
-
-    def testRussianHasDifferentVariantsForEachMonth(self):
-        for i in range(1, 13):
-           mvi = self.month_variants[i]
-           self.assertTrue(len(mvi) > 1, msg=mvi)
-
-    def testNoEmptyStringInVariants(self):
-        for i in range(1, 13):
-           mvi = self.month_variants[i]
-           self.assertNotIn("", mvi)
-
-    def testLongMonthsAppearInVariants(self):
-        for i in range(1, 13):
-           lmi = self.ds.long_months[i]
-           mvi = self.month_variants[i]
-           self.assertIn("{}".format(lmi), mvi)
-
-    def testShortMonthsAppearInVariants(self):
-        for i in range(1, 13):
-           smi = self.ds.short_months[i]
-           mvi = self.month_variants[i]
-           self.assertIn("{}".format(smi), mvi)
-
-    def testLongMonthVariantsUnique(self):
-        for i in range(1, 13):
-           mvi = self.month_variants[i]
-           self.assertEqual(len(mvi), len(set(mvi)), msg=mvi)
-
-    def testRuMayVariantsContainSvMaj(self):
-        v = self.month_variants[5]
-        self.assertIn("Maj", v)
-
-if __name__ == "__main__":
-    unittest.main()
@@ -1,82 +0,0 @@
-# -*- coding: utf-8 -*- 
-#
-# Gramps - a GTK+/GNOME based genealogy program
-#
-# Copyright (C) 2013  Vassilii Khachaturov
-#
-# 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-
-from __future__ import print_function, unicode_literals
-
-import unittest
-
-from .. import _datestrings
-from ...lib.date import Date
-
-class DateStringsTest(unittest.TestCase):
-    def setUp(self):
-        from ...utils.grampslocale import GrampsLocale
-        self.ds = _datestrings.DateStrings(GrampsLocale()) # whatever the default...
-        self.ds_EN = _datestrings.DateStrings(GrampsLocale(languages='en'))
-        self.ds_RU = _datestrings.DateStrings(GrampsLocale(languages='ru'))
-
-    def testTwelfthMonthIsDecember(self):
-        self.assertEqual(self.ds_EN.long_months[12], 'December')
-        self.assertEqual(self.ds_EN.short_months[12], 'Dec')
-
-    # May is 3-letter in Russian, and so abbreviated form
-    # will be different for inflections!
-    def testRussianHasDifferentInflectionsForShortMay(self):
-           v5 = list(self.ds_RU.short_months[5].variants())
-           self.assertTrue(len(v5) > 1, msg=v5)
-
-    def testEnAdarI_in_AdarII(self):
-        adar1 = self.ds_EN.hebrew[6]
-        adar2 = self.ds_EN.hebrew[7]
-        self.assertIn(str(adar1), str(adar2))
-
-    def testEnLastFrenchIsExtra(self):
-        self.assertEqual(str(self.ds_EN.french[-1]), "Extra")
-
-    def testEnPersianKhordadMordad(self):
-        khordad = self.ds_EN.persian[3].lower()
-        mordad = self.ds_EN.persian[5].lower()
-        self.assertEqual(khordad, "khordad")
-        self.assertEqual(mordad, "mordad")
-
-    def testEnIslamicRamadan9(self):
-        self.assertEqual(str(self.ds_EN.islamic[9]), "Ramadan")
-
-    def testFirstStringEmpty(self):
-        self.assertEqual(self.ds.long_months[0], "")
-        self.assertEqual(self.ds.short_months[0], "")
-        self.assertEqual(self.ds.alt_long_months[0], "")
-        self.assertEqual(self.ds.long_days[0], "")
-
-    def testCalendarIndex(self):
-        self.assertEqual(self.ds_EN.calendar[Date.CAL_GREGORIAN], "Gregorian")
-        self.assertEqual(self.ds_EN.calendar[Date.CAL_JULIAN], "Julian")
-        self.assertEqual(self.ds_EN.calendar[Date.CAL_HEBREW], "Hebrew")
-        self.assertEqual(self.ds_EN.calendar[Date.CAL_FRENCH], "French Republican")
-        self.assertEqual(self.ds_EN.calendar[Date.CAL_PERSIAN], "Persian")
-        self.assertEqual(self.ds_EN.calendar[Date.CAL_ISLAMIC], "Islamic")
-        self.assertEqual(self.ds_EN.calendar[Date.CAL_SWEDISH], "Swedish")
-
-    def testDayNamesLenIs8(self):
-        self.assertEqual(len(self.ds.long_days), 8)
-
-if __name__ == "__main__":
-    unittest.main()
@@ -17,71 +17,59 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
+# gen/db/__init__.py
+# $Id$
+#

 """
-Gramps Database API.
+    Gramps Database API.

-Database Architecture
-=====================
+    Database Architecture
+    =====================

-Access to the database is made through Python classes. Exactly
-what functionality you have is dependent on the properties of the
-database. For example, if you are accessing a read-only view, then
-you will only have access to a subset of the methods available.
+    Access to the database is made through Python classes. Exactly
+    what functionality you have is dependent on the properties of the
+    database. For example, if you are accessing a read-only view, then
+    you will only have access to a subset of the methods available.

-At the root of any database interface is either :py:class:`.DbReadBase` and/or
-:py:class:`.DbWriteBase`. These define the methods to read and write to a
-database, respectively.
+    At the root of any database interface is either DbReadBase and/or
+    DbWriteBase. These define the methods to read and write to a
+    database, respectively.

-The full database hierarchy is:
+    The full database hierarchy is:

- :py:class:`.DbBsddb` - read and write implementation to BSDDB databases
+    - B{DbBsddb} - read and write implementation to BSDDB databases (U{gen/db/write<http://svn.code.sf.net/p/gramps/code/trunk/gramps/gen/db/write.py?view=markup>})
+        - B{DbWriteBase} - virtual and implementation-independent methods for reading data (U{gen/db/base.py<http://svn.code.sf.net/p/gramps/code/trunk/gramps/gen/db/base.py?view=markup>})
+        - B{DbBsddbRead} - read-only (accessors, getters) implementation to BSDDB databases (U{gen/db/read.py<http://svn.code.sf.net/p/gramps/code/trunk/gramps/gen/db/read.py?view=markup})
+            - B{DbReadBase} - virtual and implementation-independent methods for reading data (U{gen/db/base.py<http://svn.code.sf.net/p/gramps/code/trunk/gramps/gen/db/base.py?view=markup})
+            - B{Callback} - callback and signal functions (U{gen/utils/callback.py<http://svn.code.sf.net/p/gramps/code/trunk/gramps/gen/utils/callback.py?view=markup})
+        - B{UpdateCallback} - callback functionality (U{gen/updatecallback.py<http://svn.code.sf.net/p/gramps/code/trunk/gramps/gen/db/read.py?view=markup gen/updatecallback.py?view=markup>})
+    - B{DbDjango} - read and write implementation to Django-based databases (U{web/dbdjango.py<http://svn.code.sf.net/p/gramps/code/trunk/gramps/webapp/dbdjango.py?view=markup})
+        - B{DbWriteBase} - virtual and implementation-independent methods for reading data (U{gen/db/base.py<http://svn.code.sf.net/p/gramps/code/trunk/gramps/gen/db/base.py?view=markup})
+        - B{DbReadBase} - virtual and implementation-independent methods for reading data (U{gen/db/base.py<http://svn.code.sf.net/p/gramps/code/trunk/gramps/gen/db/base.py?view=markup})

-  * :py:class:`.DbWriteBase` - virtual and implementation-independent methods
-    for reading data
+    DbBsddb
+    =======

-  * :py:class:`.DbBsddbRead` - read-only (accessors, getters) implementation
-    to BSDDB databases
+    The DbBsddb interface defines a hierarchical database
+    (non-relational) written in
+    U{http://www.jcea.es/programacion/pybsddb.htm PyBSDDB}. There is no
+    such thing as a database schema, and the meaning of the data is
+    defined in the Python classes above. The data is stored as pickled
+    tuples and unserialized into the primary data types (below).

-    + :py:class:`.DbReadBase` - virtual and implementation-independent
-      methods for reading data
+    DbDjango
+    ========

-    + :py:class:`.Callback` - callback and signal functions
+    The DbDjango interface defines the Gramps data in terms of
+    I{models} and I{relations} from the
+    U{Django project<http://www.djangoproject.com/}. The database
+    backend can be any implementation that supports Django, including
+    such popular SQL implementations as sqlite, MySQL, Postgresql, and
+    Oracle. The data is retrieved from the SQL fields, serialized and
+    then unserialized into the primary data types (below).

-  * :py:class:`.UpdateCallback` - callback functionality
-
- :py:class:`.DbDjango` - read and write implementation to Django-based
-  databases
-
-  * :py:class:`.DbWriteBase` - virtual and implementation-independent methods
-    for reading data
-
-  * :py:class:`.DbReadBase` - virtual and implementation-independent methods
-    for reading data
-
-DbBsddb
-=======
-
-The :py:class:`.DbBsddb` interface defines a hierarchical database
-(non-relational) written in
-`PyBSDDB <http://www.jcea.es/programacion/pybsddb.htm>`_. There is no
-such thing as a database schema, and the meaning of the data is
-defined in the Python classes above. The data is stored as pickled
-tuples and unserialized into the primary data types (below).
-
-DbDjango
-========
-
-The DbDjango interface defines the Gramps data in terms of
-*models* and *relations* from the
-`Django project <http://www.djangoproject.com/>`_. The database
-backend can be any implementation that supports Django, including
-such popular SQL implementations as sqlite, MySQL, Postgresql, and
-Oracle. The data is retrieved from the SQL fields, serialized and
-then unserialized into the primary data types (below).
-
-More details can be found in the manual's
-`Using database API <http://www.gramps-project.org/wiki/index.php?title=Using_database_API>`_.
+    More details can be found in the manual's U{Using database API<http://www.gramps-project.org/wiki/index.php?title=Using_database_API>}.
 """

 from .base import *
@@ -19,6 +19,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # gen/db/backup.py
+# $Id$
+#

 """
 Description
@@ -81,11 +83,11 @@ def backup(database):
    Exports the database to a set of backup files. These files consist
    of the pickled database tables, one file for each table.

-    The heavy lifting is done by the private :py:func:`__do__export` function.
-    The purpose of this function is to catch any exceptions that occur.
+    The heavy lifting is done by the private __do__export function. The 
+    purpose of this function is to catch any exceptions that occur.

-    :param database: database instance to backup
-    :type database: DbDir
+    @param database: database instance to backup
+    @type database: DbDir
    """
    try:
        __do_export(database)
@@ -96,10 +98,10 @@ def __mk_backup_name(database, base):
    """
    Return the backup name of the database table

-    :param database: database instance 
-    :type database: DbDir
-    :param base: base name of the table
-    :type base: str
+    @param database: database instance 
+    @type database: DbDir
+    @param base: base name of the table
+    @type base: str
    """
    return os.path.join(database.get_save_path(), base + ".gbkp")

@@ -107,10 +109,10 @@ def __mk_tmp_name(database, base):
    """
    Return the temporary backup name of the database table

-    :param database: database instance 
-    :type database: DbDir
-    :param base: base name of the table
-    :type base: str
+    @param database: database instance 
+    @type database: DbDir
+    @param base: base name of the table
+    @type base: str
    """
    return os.path.join(database.get_save_path(), base + ".gbkp.new")

@@ -119,8 +121,8 @@ def __do_export(database):
    Loop through each table of the database, saving the pickled data
    a file.

-    :param database: database instance to backup
-    :type database: DbDir
+    @param database: database instance to backup
+    @type database: DbDir
    """
    try:
        for (base, tbl) in __build_tbl_map(database):
@@ -149,11 +151,11 @@ def restore(database):
    Restores the database to a set of backup files. These files consist
    of the pickled database tables, one file for each table.

-    The heavy lifting is done by the private :py:func:`__do__restore` function.
-    The purpose of this function is to catch any exceptions that occur.
+    The heavy lifting is done by the private __do__restore function. The 
+    purpose of this function is to catch any exceptions that occur.

-    :param database: database instance to restore
-    :type database: DbDir
+    @param database: database instance to restore
+    @type database: DbDir
    """
    try:
        __do_restore(database)
@@ -165,8 +167,8 @@ def __do_restore(database):
    Loop through each table of the database, restoring the pickled data
    to the appropriate database file.

-    :param database: database instance to backup
-    :type database: DbDir
+    @param database: database instance to backup
+    @type database: DbDir
    """
    for (base, tbl) in __build_tbl_map(database):
        backup_name = __mk_backup_name(database, base)
@@ -179,12 +181,12 @@ def __load_tbl_txn(database, backup_table, tbl):
    """
    Return the temporary backup name of the database table

-    :param database: database instance 
-    :type database: DbDir
-    :param backup_table: file containing the backup data
-    :type backup_table: file
-    :param tbl: Berkeley db database table
-    :type tbl: Berkeley db database table
+    @param database: database instance 
+    @type database: DbDir
+    @param backup_table: file containing the backup data
+    @type backup_table: file
+    @param tbl: Berkeley db database table
+    @type tbl: Berkeley db database table
    """
    try:
        while True:
@@ -199,8 +201,8 @@ def __build_tbl_map(database):
    """
    Builds a table map of names to database tables.

-    :param database: database instance to backup
-    :type database: DbDir
+    @param database: database instance to backup
+    @type database: DbDir
    """
    return [
        ( PERSON_TBL,  database.person_map.db),
@@ -20,8 +20,10 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

+# $Id$
+
 """
-Base class for the Gramps databases. All database interfaces should inherit
+Base class for the GRAMPS databases. All database interfaces should inherit
 from this class.
 """

@@ -35,7 +37,7 @@ _ = glocale.translation.gettext

 #-------------------------------------------------------------------------
 #
-# Gramps libraries
+# GRAMPS libraries
 #
 #-------------------------------------------------------------------------
 from ..lib.childreftype import ChildRefType
@@ -45,7 +47,7 @@ from .exceptions import DbTransactionCancel

 class DbReadBase(object):
    """
-    Gramps database object. This object is a base class for all
+    GRAMPS database object. This object is a base class for all
    database interfaces.  All methods raise NotImplementedError
    and must be implemented in the derived class as required.
    """
@@ -59,18 +61,6 @@ class DbReadBase(object):
        """
        self.basedb = self
        self.__feature = {} # {"feature": VALUE, ...}
-        self._tables = {
-            "Citation": {},
-            "Event": {},
-            "Family": {},
-            "Media": {},
-            "Note": {},
-            "Person": {},
-            "Place": {},
-            "Repository": {},
-            "Source": {},
-            "Tag": {},
-        }

    def get_feature(self, feature):
        """
@@ -135,56 +125,56 @@ class DbReadBase(object):

    def find_next_event_gramps_id(self):
        """
-        Return the next available Gramps ID for a Event object based off the 
+        Return the next available GRAMPS' ID for a Event object based off the 
        event ID prefix.
        """
        raise NotImplementedError

    def find_next_family_gramps_id(self):
        """
-        Return the next available Gramps ID for a Family object based off the 
+        Return the next available GRAMPS' ID for a Family object based off the 
        family ID prefix.
        """
        raise NotImplementedError

    def find_next_note_gramps_id(self):
        """
-        Return the next available Gramps ID for a Note object based off the 
+        Return the next available GRAMPS' ID for a Note object based off the 
        note ID prefix.
        """
        raise NotImplementedError

    def find_next_object_gramps_id(self):
        """
-        Return the next available Gramps ID for a MediaObject object based
+        Return the next available GRAMPS' ID for a MediaObject object based
        off the media object ID prefix.
        """
        raise NotImplementedError

    def find_next_person_gramps_id(self):
        """
-        Return the next available Gramps ID for a Person object based off the 
+        Return the next available GRAMPS' ID for a Person object based off the 
        person ID prefix.
        """
        raise NotImplementedError

    def find_next_place_gramps_id(self):
        """
-        Return the next available Gramps ID for a Place object based off the 
+        Return the next available GRAMPS' ID for a Place object based off the 
        place ID prefix.
        """
        raise NotImplementedError

    def find_next_repository_gramps_id(self):
        """
-        Return the next available Gramps ID for a Repository object based 
+        Return the next available GRAMPS' ID for a Repository object based 
        off the repository ID prefix.
        """
        raise NotImplementedError

    def find_next_source_gramps_id(self):
        """
-        Return the next available Gramps ID for a Source object based off the 
+        Return the next available GRAMPS' ID for a Source object based off the 
        source ID prefix.
        """
        raise NotImplementedError
@@ -228,7 +218,7 @@ class DbReadBase(object):

    def get_event_from_gramps_id(self, val):
        """
-        Find an Event in the database from the passed Gramps ID.
+        Find an Event in the database from the passed GRAMPS ID.
        
        If no such Event exists, None is returned.
        Needs to be overridden by the derived class.
@@ -237,7 +227,7 @@ class DbReadBase(object):

    def get_event_from_handle(self, handle):
        """
-        Find a Event in the database from the passed Gramps ID.
+        Find a Event in the database from the passed gramps' ID.
        
        If no such Event exists, None is returned.
        """
@@ -257,19 +247,6 @@ class DbReadBase(object):
        """
        raise NotImplementedError

-    def get_event_attribute_types(self):
-        """
-        Return a list of all Attribute types assocated with Event instances
-        in the database.
-        """
-        raise NotImplementedError
-
-    def get_event_types(self):
-        """
-        Return a list of all event types in the database.
-        """
-        raise NotImplementedError
-
    def get_family_attribute_types(self):
        """
        Return a list of all Attribute types associated with Family instances 
@@ -291,13 +268,14 @@ class DbReadBase(object):

    def get_family_event_types(self):
        """
-        Deprecated:  Use get_event_types
+        Return a list of all Event types associated with Family instances in 
+        the database.
        """
        raise NotImplementedError

    def get_family_from_gramps_id(self, val):
        """
-        Find a Family in the database from the passed Gramps ID.
+        Find a Family in the database from the passed GRAMPS ID.
        
        If no such Family exists, None is returned.
        Need to be overridden by the derived class.
@@ -306,7 +284,7 @@ class DbReadBase(object):

    def get_family_from_handle(self, handle):
        """
-        Find a Family in the database from the passed Gramps ID.
+        Find a Family in the database from the passed gramps' ID.
        
        If no such Family exists, None is returned.
        """
@@ -412,7 +390,7 @@ class DbReadBase(object):

    def get_note_from_gramps_id(self, val):
        """
-        Find a Note in the database from the passed Gramps ID.
+        Find a Note in the database from the passed gramps' ID.

        If no such Note exists, None is returned.
        Needs to be overridden by the derived classderri.
@@ -421,7 +399,7 @@ class DbReadBase(object):

    def get_note_from_handle(self, handle):
        """
-        Find a Note in the database from the passed Gramps ID.
+        Find a Note in the database from the passed gramps' ID.
        
        If no such Note exists, None is returned.
        """
@@ -497,7 +475,7 @@ class DbReadBase(object):

    def get_object_from_gramps_id(self, val):
        """
-        Find a MediaObject in the database from the passed Gramps ID.
+        Find a MediaObject in the database from the passed gramps' ID.

        If no such MediaObject exists, None is returned.
        Needs to be overridden by the derived class.
@@ -506,7 +484,7 @@ class DbReadBase(object):

    def get_object_from_handle(self, handle):
        """
-        Find an Object in the database from the passed Gramps ID.
+        Find an Object in the database from the passed gramps' ID.
        
        If no such Object exists, None is returned.
        """
@@ -527,13 +505,14 @@ class DbReadBase(object):

    def get_person_event_types(self):
        """
-        Deprecated:  Use get_event_types
+        Return a list of all Event types associated with Person instances in 
+        the database.
        """
        raise NotImplementedError

    def get_person_from_gramps_id(self, val):
        """
-        Find a Person in the database from the passed Gramps ID.
+        Find a Person in the database from the passed GRAMPS ID.
        
        If no such Person exists, None is returned.
        Needs to be overridden by the derived class.
@@ -542,7 +521,7 @@ class DbReadBase(object):

    def get_person_from_handle(self, handle):
        """
-        Find a Person in the database from the passed Gramps ID.
+        Find a Person in the database from the passed gramps' ID.
        
        If no such Person exists, None is returned.
        """
@@ -557,13 +536,6 @@ class DbReadBase(object):
        """
        raise NotImplementedError

-    def get_source_attribute_types(self):
-        """
-        Return a list of all Attribute types associated with Source/Citation
-        instances in the database.
-        """
-        raise NotImplementedError
-
    def get_place_bookmarks(self):
        """
        Return the list of Place handles in the bookmarks.
@@ -578,7 +550,7 @@ class DbReadBase(object):

    def get_place_from_gramps_id(self, val):
        """
-        Find a Place in the database from the passed Gramps ID.
+        Find a Place in the database from the passed gramps' ID.
        
        If no such Place exists, None is returned.
        Needs to be overridden by the derived class.
@@ -587,7 +559,7 @@ class DbReadBase(object):

    def get_place_from_handle(self, handle):
        """
-        Find a Place in the database from the passed Gramps ID.
+        Find a Place in the database from the passed gramps' ID.
        
        If no such Place exists, None is returned.
        """
@@ -694,7 +666,7 @@ class DbReadBase(object):

    def get_repository_from_gramps_id(self, val):
        """
-        Find a Repository in the database from the passed Gramps ID.
+        Find a Repository in the database from the passed gramps' ID.

        If no such Repository exists, None is returned.
        Needs to be overridden by the derived class.
@@ -703,7 +675,7 @@ class DbReadBase(object):

    def get_repository_from_handle(self, handle):
        """
-        Find a Repository in the database from the passed Gramps ID.
+        Find a Repository in the database from the passed gramps' ID.
        
        If no such Repository exists, None is returned.
        """
@@ -750,7 +722,7 @@ class DbReadBase(object):

    def get_source_from_gramps_id(self, val):
        """
-        Find a Source in the database from the passed Gramps ID.
+        Find a Source in the database from the passed gramps' ID.
        
        If no such Source exists, None is returned.
        Needs to be overridden by the derived class.
@@ -759,7 +731,7 @@ class DbReadBase(object):

    def get_source_from_handle(self, handle):
        """
-        Find a Source in the database from the passed Gramps ID.
+        Find a Source in the database from the passed gramps' ID.
        
        If no such Source exists, None is returned.
        """
@@ -795,7 +767,7 @@ class DbReadBase(object):

    def get_citation_from_gramps_id(self, val):
        """
-        Find a Citation in the database from the passed Gramps ID.
+        Find a Citation in the database from the passed gramps' ID.
        
        If no such Citation exists, None is returned.
        Needs to be overridden by the derived class.
@@ -804,7 +776,7 @@ class DbReadBase(object):

    def get_citation_from_handle(self, handle):
        """
-        Find a Citation in the database from the passed Gramps ID.
+        Find a Citation in the database from the passed gramps' ID.
        
        If no such Citation exists, None is returned.
        """
@@ -864,13 +836,6 @@ class DbReadBase(object):
        """
        raise NotImplementedError

-    def get_place_types(self):
-        """
-        Return a list of all custom place types assocated with Place instances
-        in the database.
-        """
-        raise NotImplementedError
-
    def gramps_upgrade(self):
        """
        Return True if database is upgraded
@@ -1078,9 +1043,8 @@ class DbReadBase(object):
        internal data dependent on the database should be rebuilt.
        Note that all rebuild signals on all objects are emitted at the same
        time. It is correct to assume that this is always the case.
-
-        .. todo:: it might be better to replace these rebuild signals by one
-                  single database-rebuild signal.
+        TODO: it might be better to replace these rebuild signals by one single
+                database-rebuild signal.
        """
        raise NotImplementedError

@@ -1092,7 +1056,7 @@ class DbReadBase(object):

    def set_event_id_prefix(self, val):
        """
-        Set the naming template for Gramps Event ID values. 
+        Set the naming template for GRAMPS Event ID values. 
        
        The string is expected to be in the form of a simple text string, or 
        in a format that contains a C/Python style format string using %d, 
@@ -1102,7 +1066,7 @@ class DbReadBase(object):

    def set_family_id_prefix(self, val):
        """
-        Set the naming template for Gramps Family ID values. The string is
+        Set the naming template for GRAMPS Family ID values. The string is
        expected to be in the form of a simple text string, or in a format
        that contains a C/Python style format string using %d, such as F%d
        or F%04d.
@@ -1111,7 +1075,7 @@ class DbReadBase(object):

    def set_note_id_prefix(self, val):
        """
-        Set the naming template for Gramps Note ID values. 
+        Set the naming template for GRAMPS Note ID values. 
        
        The string is expected to be in the form of a simple text string, or 
        in a format that contains a C/Python style format string using %d, 
@@ -1121,7 +1085,7 @@ class DbReadBase(object):

    def set_object_id_prefix(self, val):
        """
-        Set the naming template for Gramps MediaObject ID values. 
+        Set the naming template for GRAMPS MediaObject ID values. 
        
        The string is expected to be in the form of a simple text string, or 
        in a format that contains a C/Python style format string using %d, 
@@ -1131,7 +1095,7 @@ class DbReadBase(object):

    def set_person_id_prefix(self, val):
        """
-        Set the naming template for Gramps Person ID values. 
+        Set the naming template for GRAMPS Person ID values. 
        
        The string is expected to be in the form of a simple text string, or 
        in a format that contains a C/Python style format string using %d, 
@@ -1141,7 +1105,7 @@ class DbReadBase(object):

    def set_place_id_prefix(self, val):
        """
-        Set the naming template for Gramps Place ID values. 
+        Set the naming template for GRAMPS Place ID values. 
        
        The string is expected to be in the form of a simple text string, or 
        in a format that contains a C/Python style format string using %d, 
@@ -1158,7 +1122,7 @@ class DbReadBase(object):

    def set_repository_id_prefix(self, val):
        """
-        Set the naming template for Gramps Repository ID values. 
+        Set the naming template for GRAMPS Repository ID values. 
        
        The string is expected to be in the form of a simple text string, or 
        in a format that contains a C/Python style format string using %d, 
@@ -1168,7 +1132,7 @@ class DbReadBase(object):

    def set_source_id_prefix(self, val):
        """
-        Set the naming template for Gramps Source ID values. 
+        Set the naming template for GRAMPS Source ID values. 
        
        The string is expected to be in the form of a simple text string, or 
        in a format that contains a C/Python style format string using %d, 
@@ -1228,7 +1192,7 @@ class DbReadBase(object):

 class DbWriteBase(DbReadBase):
    """
-    Gramps database object. This object is a base class for all
+    GRAMPS database object. This object is a base class for all
    database interfaces.  All methods raise NotImplementedError
    and must be implemented in the derived class as required.
    """
@@ -1262,7 +1226,8 @@ class DbWriteBase(DbReadBase):

    def add_family_event(self, event, transaction):
        """
-        Deprecated:  Use add_event
+        Add an Event to the database, assigning internal IDs if they have
+        not already been defined.
        """
        raise NotImplementedError

@@ -1295,7 +1260,8 @@ class DbWriteBase(DbReadBase):

    def add_person_event(self, event, transaction):
        """
-        Deprecated:  Use add_event
+        Add an Event to the database, assigning internal IDs if they have
+        not already been defined.
        """
        raise NotImplementedError

@@ -1368,7 +1334,8 @@ class DbWriteBase(DbReadBase):

    def commit_family_event(self, event, transaction, change_time=None):
        """
-        Deprecated:  Use commit_event
+        Commit the specified family Event to the database, storing the
+        changes as part of the transaction.
        """
        raise NotImplementedError

@@ -1395,7 +1362,8 @@ class DbWriteBase(DbReadBase):

    def commit_personal_event(self, event, transaction, change_time=None):
        """
-        Deprecated:  Use commit_event
+        Commit the specified personal Event to the database, storing the
+        changes as part of the transaction.
        """
        raise NotImplementedError

@@ -1590,9 +1558,9 @@ class DbWriteBase(DbReadBase):
        before the start of such database operations.

        :param transaction: Gramps transaction ...
-        :type transaction: :py:class:`.DbTxn`
+        :type transaction: DbTxn
        :returns: Returns the Gramps transaction.
-        :rtype: :py:class:`.DbTxn`
+        :rtype: DbTxn
        """
        raise NotImplementedError

@@ -18,6 +18,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

+# $Id$
+
 """
 BSDDBTxn class: Wrapper for BSDDB transaction-oriented methods
 """
@@ -18,6 +18,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # gen/db/cursor.py
+# $Id$
+#

 #-------------------------------------------------------------------------
 #
@@ -31,20 +33,10 @@ else:
    from pickle import dumps, loads

 from ..config import config
-try:
-    if config.get('preferences.use-bsddb3') or sys.version_info[0] >= 3:
-        from bsddb3 import db
-    else:
-        from bsddb import db
-except:
-    # FIXME: make this more abstract to deal with other backends
-    class db:
-        DB_RMW = 0
-        DB_FIRST = 0
-        DB_LAST = 0
-        DB_CURRENT = 0
-        DB_PREV = 0
-        DB_NEXT = 0
+if config.get('preferences.use-bsddb3') or sys.version_info[0] >= 3:
+    from bsddb3 import db
+else:
+    from bsddb import db

 #-------------------------------------------------------------------------
 #
@@ -19,6 +19,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

+# $Id$
+
 """
 Declare constants used by database modules
 """
@@ -39,7 +41,7 @@ __all__ = (
            ('DBPAGE', 'DBMODE', 'DBCACHE', 'DBLOCKS', 'DBOBJECTS', 'DBUNDO',
             'DBEXT', 'DBMODE_R', 'DBMODE_W', 'DBUNDOFN', 'DBLOCKFN',
             'DBRECOVFN','BDBVERSFN', 'DBLOGNAME', 'DBFLAGS_O',  'DBFLAGS_R',
-             'DBFLAGS_D', 'SCHVERSFN', 'PCKVERSFN'
+             'DBFLAGS_D', 'SCHVERSFN'
            ) +
            
            ('PERSON_KEY', 'FAMILY_KEY', 'SOURCE_KEY', 'CITATION_KEY',
@@ -56,7 +58,6 @@ DBLOCKFN  = "lock"          # File name of lock file
 DBRECOVFN = "need_recover"  # File name of recovery file
 BDBVERSFN = "bdbversion.txt"# File name of Berkeley DB version file
 SCHVERSFN = "schemaversion.txt"# File name of schema version file
-PCKVERSFN = "pickleupgrade.txt" # Indicator that pickle has been upgrade t Python3
 DBLOGNAME = ".Db"           # Name of logger
 DBMODE_R  = "r"             # Read-only access
 DBMODE_W  = "w"             # Full Read/Write access
@@ -68,20 +69,13 @@ DBOBJECTS = 100000          # Maximum number of simultaneously locked objects
 DBUNDO    = 1000            # Maximum size of undo buffer

 from ..config import config
-try:
-    if config.get('preferences.use-bsddb3') or sys.version_info[0] >= 3:
-        from bsddb3.db import DB_CREATE, DB_AUTO_COMMIT, DB_DUP, DB_DUPSORT, DB_RDONLY
-    else:
-        from bsddb.db import DB_CREATE, DB_AUTO_COMMIT, DB_DUP, DB_DUPSORT, DB_RDONLY
-    DBFLAGS_O = DB_CREATE | DB_AUTO_COMMIT  # Default flags for database open
-    DBFLAGS_R = DB_RDONLY                   # Flags to open a database read-only
-    DBFLAGS_D = DB_DUP | DB_DUPSORT         # Default flags for duplicate keys
-except:
-    print("WARNING: no bsddb support")
-    # FIXME: make this more abstract to deal with other backends, or do not import
-    DBFLAGS_O = DB_CREATE = DB_AUTO_COMMIT = 0
-    DBFLAGS_R = DB_RDONLY = 0
-    DBFLAGS_D = DB_DUP = DB_DUPSORT = 0
+if config.get('preferences.use-bsddb3') or sys.version_info[0] >= 3:
+    from bsddb3.db import DB_CREATE, DB_AUTO_COMMIT, DB_DUP, DB_DUPSORT, DB_RDONLY
+else:
+    from bsddb.db import DB_CREATE, DB_AUTO_COMMIT, DB_DUP, DB_DUPSORT, DB_RDONLY
+DBFLAGS_O = DB_CREATE | DB_AUTO_COMMIT  # Default flags for database open
+DBFLAGS_R = DB_RDONLY                   # Flags to open a database read-only
+DBFLAGS_D = DB_DUP | DB_DUPSORT         # Default flags for duplicate keys

 PERSON_KEY     = 0
 FAMILY_KEY     = 1
@@ -16,6 +16,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
+# $Id$
+#

 """ Implements a Db interface as a Dictionary """

@@ -34,16 +36,14 @@ import time
 import re
 from . import DbReadBase, DbWriteBase, DbTxn
 from . import (PERSON_KEY,
-               FAMILY_KEY,
-               CITATION_KEY,
-               SOURCE_KEY,
-               EVENT_KEY,
-               MEDIA_KEY,
-               PLACE_KEY,
-               REPOSITORY_KEY,
-               NOTE_KEY,
-               TAG_KEY)
-
+                    FAMILY_KEY,
+                    CITATION_KEY,
+                    SOURCE_KEY,
+                    EVENT_KEY,
+                    MEDIA_KEY,
+                    PLACE_KEY,
+                    REPOSITORY_KEY,
+                    NOTE_KEY)
 from ..utils.id import create_id
 from ..lib.researcher import Researcher
 from ..lib.mediaobj import MediaObject
@@ -86,8 +86,8 @@ class Bookmarks:
        pass

 class DictionaryTxn(DbTxn):
-    def __init__(self, message, db, batch=False):
-        DbTxn.__init__(self, message, db, batch)
+    def __init__(self, message, db):
+        DbTxn.__init__(self, message, db)

    def get(self, key, default=None, txn=None, **kwargs):
        """
@@ -107,112 +107,94 @@ class DictionaryDb(DbWriteBase, DbReadBase):
    """
    A Gramps Database Backend. This replicates the grampsdb functions.
    """
+
    def __init__(self, *args, **kwargs):
        DbReadBase.__init__(self)
        DbWriteBase.__init__(self)
-        self._tables['Person'].update(
-            {
+        self._tables = {
+            'Person':
+                {
                "handle_func": self.get_person_from_handle, 
                "gramps_id_func": self.get_person_from_gramps_id,
                "class_func": Person,
                "cursor_func": self.get_person_cursor,
                "handles_func": self.get_person_handles,
-                "add_func": self.add_person,
-                "commit_func": self.commit_person,
-            })
-        self._tables['Family'].update(
-            {
+                },
+            'Family':
+                {
                "handle_func": self.get_family_from_handle, 
                "gramps_id_func": self.get_family_from_gramps_id,
                "class_func": Family,
                "cursor_func": self.get_family_cursor,
                "handles_func": self.get_family_handles,
-                "add_func": self.add_family,
-                "commit_func": self.commit_family,
-            })
-        self._tables['Source'].update(
-            {
+                },
+            'Source':
+                {
                "handle_func": self.get_source_from_handle, 
                "gramps_id_func": self.get_source_from_gramps_id,
                "class_func": Source,
                "cursor_func": self.get_source_cursor,
                "handles_func": self.get_source_handles,
-                "add_func": self.add_source,
-                "commit_func": self.commit_source,
-                })
-        self._tables['Citation'].update(
-            {
+                },
+            'Citation':
+                {
                "handle_func": self.get_citation_from_handle, 
                "gramps_id_func": self.get_citation_from_gramps_id,
                "class_func": Citation,
                "cursor_func": self.get_citation_cursor,
                "handles_func": self.get_citation_handles,
-                "add_func": self.add_citation,
-                "commit_func": self.commit_citation,
-            })
-        self._tables['Event'].update(
-            {
+                },
+            'Event':
+                {
                "handle_func": self.get_event_from_handle, 
                "gramps_id_func": self.get_event_from_gramps_id,
                "class_func": Event,
                "cursor_func": self.get_event_cursor,
                "handles_func": self.get_event_handles,
-                "add_func": self.add_event,
-                "commit_func": self.commit_event,
-            })
-        self._tables['Media'].update(
-            {
+                },
+            'Media':
+                {
                "handle_func": self.get_object_from_handle, 
                "gramps_id_func": self.get_object_from_gramps_id,
                "class_func": MediaObject,
                "cursor_func": self.get_media_cursor,
                "handles_func": self.get_media_object_handles,
-                "add_func": self.add_object,
-                "commit_func": self.commit_media_object,
-            })
-        self._tables['Place'].update(
-            {
+                },
+            'Place':
+                {
                "handle_func": self.get_place_from_handle, 
                "gramps_id_func": self.get_place_from_gramps_id,
                "class_func": Place,
                "cursor_func": self.get_place_cursor,
                "handles_func": self.get_place_handles,
-                "add_func": self.add_place,
-                "commit_func": self.commit_place,
-            })
-        self._tables['Repository'].update(
-            {
+                },
+            'Repository':
+                {
                "handle_func": self.get_repository_from_handle, 
                "gramps_id_func": self.get_repository_from_gramps_id,
                "class_func": Repository,
                "cursor_func": self.get_repository_cursor,
                "handles_func": self.get_repository_handles,
-                "add_func": self.add_repository,
-                "commit_func": self.commit_repository,
-            })
-        self._tables['Note'].update(
-            {
+                },
+            'Note':
+                {
                "handle_func": self.get_note_from_handle, 
                "gramps_id_func": self.get_note_from_gramps_id,
                "class_func": Note,
                "cursor_func": self.get_note_cursor,
                "handles_func": self.get_note_handles,
-                "add_func": self.add_note,
-                "commit_func": self.commit_note,
-            })
-        self._tables['Tag'].update(
-            {
+                },
+            'Tag':
+                {
                "handle_func": self.get_tag_from_handle, 
                "gramps_id_func": None,
                "class_func": Tag,
                "cursor_func": self.get_tag_cursor,
                "handles_func": self.get_tag_handles,
-                "add_func": self.add_tag,
-                "commit_func": self.commit_tag,
-            })
+                },
+            }
        # skip GEDCOM cross-ref check for now:
        self.set_feature("skip-check-xref", True)
-        self.set_feature("skip-import-additions", True)
        self.readonly = False
        self.db_is_open = True
        self.name_formats = []
@@ -273,20 +255,6 @@ class DictionaryDb(DbWriteBase, DbReadBase):
        self.txn = DictionaryTxn("DbDictionary Transaction", self)
        self.transaction = None

-    def version_supported(self):
-        """Return True when the file has a supported version."""
-        return True
-
-    def get_table_names(self):
-        """Return a list of valid table names."""
-        return list(self._tables.keys())
-
-    def get_table_metadata(self, table_name):
-        """Return the metadata for a valid table name."""
-        if table_name in self._tables:
-            return self._tables[table_name]
-        return None
-
    def transaction_commit(self, txn):
        pass

@@ -329,17 +297,17 @@ class DictionaryDb(DbWriteBase, DbReadBase):
                    id_number = gramps_id[len(str_prefix):]
                    if id_number.isdigit():
                        id_value = int(id_number, 10)
-                        #if len(str(id_value)) > nr_width:
-                        #    # The ID to be imported is too large to fit in the
-                        #    # users format. For now just create a new ID,
-                        #    # because that is also what happens with IDs that
-                        #    # are identical to IDs already in the database. If
-                        #    # the problem of colliding import and already
-                        #    # present IDs is solved the code here also needs
-                        #    # some solution.
-                        #    gramps_id = id_pattern % 1
-                        #else:
-                        gramps_id = id_pattern % id_value
+                        if len(str(id_value)) > nr_width:
+                            # The ID to be imported is too large to fit in the
+                            # users format. For now just create a new ID,
+                            # because that is also what happens with IDs that
+                            # are identical to IDs already in the database. If
+                            # the problem of colliding import and already
+                            # present IDs is solved the code here also needs
+                            # some solution.
+                            gramps_id = id_pattern % 1
+                        else:
+                            gramps_id = id_pattern % id_value
                return gramps_id
        else:
            def closure_func(gramps_id):
@@ -697,34 +665,34 @@ class DictionaryDb(DbWriteBase, DbReadBase):
        return len(self.repository_map)

    def get_place_cursor(self):
-        return Cursor(self.place_map, self.get_raw_place_data)
+        return Cursor(self.place_map, self.get_raw_place_data).iter()

    def get_person_cursor(self):
-        return Cursor(self.person_map, self.get_raw_person_data)
+        return Cursor(self.person_map, self.get_raw_person_data).iter()

    def get_family_cursor(self):
-        return Cursor(self.family_map, self.get_raw_family_data)
+        return Cursor(self.family_map, self.get_raw_family_data).iter()

    def get_event_cursor(self):
-        return Cursor(self.event_map, self.get_raw_event_data)
+        return Cursor(self.event_map, self.get_raw_event_data).iter()

    def get_note_cursor(self):
-        return Cursor(self.note_map, self.get_raw_note_data)
+        return Cursor(self.note_map, self.get_raw_note_data).iter()

    def get_tag_cursor(self):
-        return Cursor(self.tag_map, self.get_raw_tag_data)
+        return Cursor(self.tag_map, self.get_raw_tag_data).iter()

    def get_repository_cursor(self):
-        return Cursor(self.repository_map, self.get_raw_repository_data)
+        return Cursor(self.repository_map, self.get_raw_repository_data).iter()

    def get_media_cursor(self):
-        return Cursor(self.media_map, self.get_raw_object_data)
+        return Cursor(self.media_map, self.get_raw_object_data).iter()

    def get_citation_cursor(self):
-        return Cursor(self.citation_map, self.get_raw_citation_data)
+        return Cursor(self.citation_map, self.get_raw_citation_data).iter()

    def get_source_cursor(self):
-        return Cursor(self.source_map, self.get_raw_source_data)
+        return Cursor(self.source_map, self.get_raw_source_data).iter()

    def has_gramps_id(self, obj_key, gramps_id):
        key2table = {
@@ -985,215 +953,3 @@ class DictionaryDb(DbWriteBase, DbReadBase):
            for (handle, data) in cursor():
                map = getattr(self, "%s_map" % key.lower())
                map[handle] = class_.create(data)
-
-    def get_transaction_class(self):
-        """
-        Get the transaction class associated with this database backend.
-        """
-        return DictionaryTxn
-
-    def get_from_name_and_handle(self, table_name, handle):
-        """
-        Returns a gen.lib object (or None) given table_name and
-        handle.
-
-        Examples:
-
-        >>> self.get_from_name_and_handle("Person", "a7ad62365bc652387008")
-        >>> self.get_from_name_and_handle("Media", "c3434653675bcd736f23")
-        """
-        if table_name in self._tables:
-            return self._tables[table_name]["handle_func"](handle)
-        return None
-
-    def get_from_name_and_gramps_id(self, table_name, gramps_id):
-        """
-        Returns a gen.lib object (or None) given table_name and
-        Gramps ID.
-
-        Examples:
-
-        >>> self.get_from_name_and_gramps_id("Person", "I00002")
-        >>> self.get_from_name_and_gramps_id("Family", "F056")
-        >>> self.get_from_name_and_gramps_id("Media", "M00012")
-        """
-        if table_name in self._tables:
-            return self._tables[table_name]["gramps_id_func"](gramps_id)
-        return None
-
-    def remove_person(self, handle, transaction):
-        """
-        Remove the Person specified by the database handle from the database, 
-        preserving the change in the passed transaction. 
-        """
-
-        if self.readonly or not handle:
-            return
-        person = self.get_person_from_handle(handle)
-        #self.genderStats.uncount_person (person)
-        #self.remove_from_surname_list(person)
-        if isinstance(handle, UNITYPE):
-            handle = handle.encode('utf-8')
-        if transaction.batch:
-            with BSDDBTxn(self.env, self.person_map) as txn:            
-                self.delete_primary_from_reference_map(handle, transaction,
-                                                       txn=txn.txn)
-                txn.delete(handle)
-        else:
-            self.delete_primary_from_reference_map(handle, transaction,
-                                                   txn=self.txn)
-            self.person_map.delete(handle, txn=self.txn)
-            transaction.add(PERSON_KEY, TXNDEL, handle, person.serialize(), None)
-
-    def remove_source(self, handle, transaction):
-        """
-        Remove the Source specified by the database handle from the
-        database, preserving the change in the passed transaction. 
-        """
-        self.__do_remove(handle, transaction, self.source_map, 
-                              SOURCE_KEY)
-
-    def remove_citation(self, handle, transaction):
-        """
-        Remove the Citation specified by the database handle from the
-        database, preserving the change in the passed transaction. 
-        """
-        self.__do_remove(handle, transaction, self.citation_map, 
-                              CITATION_KEY)
-
-    def remove_event(self, handle, transaction):
-        """
-        Remove the Event specified by the database handle from the
-        database, preserving the change in the passed transaction. 
-        """
-        self.__do_remove(handle, transaction, self.event_map, 
-                              EVENT_KEY)
-
-    def remove_object(self, handle, transaction):
-        """
-        Remove the MediaObjectPerson specified by the database handle from the
-        database, preserving the change in the passed transaction. 
-        """
-        self.__do_remove(handle, transaction, self.media_map, 
-                              MEDIA_KEY)
-
-    def remove_place(self, handle, transaction):
-        """
-        Remove the Place specified by the database handle from the
-        database, preserving the change in the passed transaction. 
-        """
-        self.__do_remove(handle, transaction, self.place_map, 
-                              PLACE_KEY)
-
-    def remove_family(self, handle, transaction):
-        """
-        Remove the Family specified by the database handle from the
-        database, preserving the change in the passed transaction. 
-        """
-        self.__do_remove(handle, transaction, self.family_map, 
-                              FAMILY_KEY)
-
-    def remove_repository(self, handle, transaction):
-        """
-        Remove the Repository specified by the database handle from the
-        database, preserving the change in the passed transaction. 
-        """
-        self.__do_remove(handle, transaction, self.repository_map, 
-                              REPOSITORY_KEY)
-
-    def remove_note(self, handle, transaction):
-        """
-        Remove the Note specified by the database handle from the
-        database, preserving the change in the passed transaction. 
-        """
-        self.__do_remove(handle, transaction, self.note_map, 
-                              NOTE_KEY)
-
-    def remove_tag(self, handle, transaction):
-        """
-        Remove the Tag specified by the database handle from the
-        database, preserving the change in the passed transaction. 
-        """
-        self.__do_remove(handle, transaction, self.tag_map, 
-                              TAG_KEY)
-
-    def __do_remove(self, handle, transaction, data_map, key):
-        if self.readonly or not handle:
-            return
-
-        if isinstance(handle, UNITYPE):
-            handle = handle.encode('utf-8')
-        if transaction.batch:
-            with BSDDBTxn(self.env, data_map) as txn:
-                self.delete_primary_from_reference_map(handle, transaction,
-                                                        txn=txn.txn)
-                txn.delete(handle)
-        else:
-            self.delete_primary_from_reference_map(handle, transaction,
-                                                   txn=self.txn)
-            old_data = data_map.get(handle, txn=self.txn)
-            data_map.delete(handle, txn=self.txn)
-            transaction.add(key, TXNDEL, handle, old_data, None)
-
-    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()
-
-        try:
-            ret = primary_cur.set(handle)
-        except:
-            ret = None
-        
-        remove_list = set()
-        while (ret is not None):
-            (key, data) = ret
-            
-            # data values are of the form:
-            #   ((primary_object_class_name, primary_object_handle),
-            #    (referenced_object_class_name, referenced_object_handle))
-            
-            # 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
-            remove_list.add(main_key)
-
-            ret = primary_cur.next_dup()
-
-        primary_cur.close()
-
-        # Now that the cursor is closed, we can remove things
-        for main_key in remove_list:
-            self.__remove_reference(main_key, transaction, txn)
-
-    def __remove_reference(self, key, transaction, txn):
-        """
-        Remove the reference specified by the key, preserving the change in 
-        the passed transaction.
-        """
-        if isinstance(key, tuple):
-            #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 save 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')
-        if not self.readonly:
-            if not transaction.batch:
-                old_data = self.reference_map.get(key, txn=txn)
-                transaction.add(REFERENCE_KEY, TXNDEL, key, old_data, None)
-                #transaction.reference_del.append(str(key))
-            self.reference_map.delete(key, txn=txn)
@@ -18,6 +18,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

+# $Id$
+
 """Exceptions generated by the Db package."""

 #-------------------------------------------------------------------------
@@ -20,8 +20,10 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

+# $Id$
+
 """
-Read classes for the Gramps databases.
+Read classes for the GRAMPS databases.
 """

 #-------------------------------------------------------------------------
@@ -42,19 +44,11 @@ import os
 from sys import maxsize

 from ..config import config
-try:
-    if config.get('preferences.use-bsddb3') or sys.version_info[0] >= 3:
-        from bsddb3 import db
-    else:
-        from bsddb import db
-except:
-    # FIXME: make this more abstract to deal with other backends
-    class db:
-        DBRunRecoveryError = 0
-        DBAccessError = 0
-        DBPageNotFoundError = 0
-        DBInvalidArgError = 0
-    
+if config.get('preferences.use-bsddb3') or sys.version_info[0] >= 3:
+    from bsddb3 import db
+else:
+    from bsddb import db
+
 import re
 import logging

@@ -195,52 +189,13 @@ class DbReadCursor(BsddbBaseCursor):
        self.cursor = source.db.cursor(txn)
        self.source = source

-#-------------------------------------------------------------------------
-#
-# DbBsddbTreeCursor
-#
-#-------------------------------------------------------------------------
-class DbBsddbTreeCursor(BsddbBaseCursor):
-
-    def __init__(self, source, primary, readonly, txn=None, **kwargs):
-        BsddbBaseCursor.__init__(self, txn=txn, **kwargs)
-        self.cursor = source.cursor(txn)
-        self.source = source
-        self.primary = primary
-        self.readonly = readonly
-
-    def __iter__(self):
-        """
-        Iterator
-        """
-        _n = self.next_dup
-        to_do = [b'']
-        while to_do:
-            key = to_do.pop()
-            key = key.encode('utf-8') if not isinstance(key, bytes) else key
-            data = self.set(key)
-            while data:
-                ### FIXME: this is a dirty hack that works without no
-                ### sensible explanation. For some reason, for a readonly
-                ### database, secondary index returns a primary table key
-                ### corresponding to the data, not the data.
-                if self.readonly:
-                    payload = self.primary.get(data[1], txn=self.txn)
-                else:
-                    payload = pickle.loads(data[1])
-                yield (payload[0], payload)
-                to_do.append(payload[0])
-                data = _n()
-
 class DbBsddbRead(DbReadBase, Callback):
    """
-    Read class for the Gramps databases.  Implements methods necessary to read
+    Read class for the GRAMPS databases.  Implements methods necessary to read
    the various object classes. Currently, there are nine (9) classes:

-    :py:class:`.Person`, :py:class:`.Family`, :py:class:`.Event`, 
-    :py:class:`.Place`, :py:class:`.Source`, 
-    :py:class:`Citation <.lib.citation.Citation>`, :py:class:`.MediaObject`, 
-    :py:class:`.Repository` and :py:class:`.Note`
+    Person, Family, Event, Place, Source, Citation, MediaObject,
+    Repository and Note

    For each object class, there are methods to retrieve data in various ways.
    In the methods described below, <object> can be one of person, family,
@@ -302,86 +257,88 @@ class DbBsddbRead(DbReadBase, Callback):
        """
        DbReadBase.__init__(self)
        Callback.__init__(self)
-        self._tables['Person'].update(
-            {
+        self._tables = {
+            'Person':
+                {
                "handle_func": self.get_person_from_handle, 
                "gramps_id_func": self.get_person_from_gramps_id,
                "class_func": Person,
                "cursor_func": self.get_person_cursor,
                "handles_func": self.get_person_handles,
-            })
-        self._tables['Family'].update(
-            {
+                },
+            'Family':
+                {
                "handle_func": self.get_family_from_handle, 
                "gramps_id_func": self.get_family_from_gramps_id,
                "class_func": Family,
                "cursor_func": self.get_family_cursor,
                "handles_func": self.get_family_handles,
-            })
-        self._tables['Source'].update(
-            {
+                },
+            'Source':
+                {
                "handle_func": self.get_source_from_handle, 
                "gramps_id_func": self.get_source_from_gramps_id,
                "class_func": Source,
                "cursor_func": self.get_source_cursor,
                "handles_func": self.get_source_handles,
-                })
-        self._tables['Citation'].update(
-            {
+                },
+            'Citation':
+                {
                "handle_func": self.get_citation_from_handle, 
                "gramps_id_func": self.get_citation_from_gramps_id,
                "class_func": Citation,
                "cursor_func": self.get_citation_cursor,
                "handles_func": self.get_citation_handles,
-            })
-        self._tables['Event'].update(
-            {
+                },
+            'Event':
+                {
                "handle_func": self.get_event_from_handle, 
                "gramps_id_func": self.get_event_from_gramps_id,
                "class_func": Event,
                "cursor_func": self.get_event_cursor,
                "handles_func": self.get_event_handles,
-            })
-        self._tables['Media'].update(
-            {
+                },
+            'Media':
+                {
                "handle_func": self.get_object_from_handle, 
                "gramps_id_func": self.get_object_from_gramps_id,
                "class_func": MediaObject,
                "cursor_func": self.get_media_cursor,
                "handles_func": self.get_media_object_handles,
-            })
-        self._tables['Place'].update(
-            {
+                },
+            'Place':
+                {
                "handle_func": self.get_place_from_handle, 
                "gramps_id_func": self.get_place_from_gramps_id,
                "class_func": Place,
                "cursor_func": self.get_place_cursor,
                "handles_func": self.get_place_handles,
-            })
-        self._tables['Repository'].update(
-            {
+                },
+            'Repository':
+                {
                "handle_func": self.get_repository_from_handle, 
                "gramps_id_func": self.get_repository_from_gramps_id,
                "class_func": Repository,
                "cursor_func": self.get_repository_cursor,
                "handles_func": self.get_repository_handles,
-            })
-        self._tables['Note'].update(
-            {
+                },
+            'Note':
+                {
                "handle_func": self.get_note_from_handle, 
                "gramps_id_func": self.get_note_from_gramps_id,
                "class_func": Note,
                "cursor_func": self.get_note_cursor,
                "handles_func": self.get_note_handles,
-            })
-        self._tables['Tag'].update(
-            {
+                },
+            'Tag':
+                {
                "handle_func": self.get_tag_from_handle, 
                "gramps_id_func": None,
                "class_func": Tag,
                "cursor_func": self.get_tag_cursor,
                "handles_func": self.get_tag_handles,
-            })
+                },
+            }

        self.set_person_id_prefix('I%04d')
        self.set_object_id_prefix('O%04d')
@@ -406,10 +363,10 @@ class DbBsddbRead(DbReadBase, Callback):
        self.nmap_index = 0
        self.db_is_open = False

-        self.event_names = set()
+        self.family_event_names = set()
+        self.individual_event_names = set()
        self.individual_attributes = set()
        self.family_attributes = set()
-        self.source_attributes = set()
        self.child_ref_types = set()
        self.family_rel_types = set()
        self.event_role_names = set()
@@ -420,7 +377,6 @@ class DbBsddbRead(DbReadBase, Callback):
        self.source_media_types = set()
        self.url_types = set()
        self.media_attributes = set()
-        self.place_types = set()

        self.open = 0
        self.genderStats = GenderStats()
@@ -522,10 +478,6 @@ class DbBsddbRead(DbReadBase, Callback):
    def get_place_cursor(self, *args, **kwargs):
        return self.get_cursor(self.place_map, *args, **kwargs)

-    def get_place_tree_cursor(self, *args, **kwargs):
-        return DbBsddbTreeCursor(self.parents, self.place_map, self.readonly,
-                                 self.txn)
-
    def get_source_cursor(self, *args, **kwargs):
        return self.get_cursor(self.source_map, *args, **kwargs)

@@ -609,7 +561,7 @@ class DbBsddbRead(DbReadBase, Callback):
        
    def find_next_person_gramps_id(self):
        """
-        Return the next available Gramps ID for a Person object based off the 
+        Return the next available GRAMPS' ID for a Person object based off the 
        person ID prefix.
        """
        self.pmap_index, gid = self.__find_next_gramps_id(self.person_prefix,
@@ -618,7 +570,7 @@ class DbBsddbRead(DbReadBase, Callback):

    def find_next_place_gramps_id(self):
        """
-        Return the next available Gramps ID for a Place object based off the 
+        Return the next available GRAMPS' ID for a Place object based off the 
        place ID prefix.
        """
        self.lmap_index, gid = self.__find_next_gramps_id(self.place_prefix,
@@ -627,7 +579,7 @@ class DbBsddbRead(DbReadBase, Callback):

    def find_next_event_gramps_id(self):
        """
-        Return the next available Gramps ID for a Event object based off the 
+        Return the next available GRAMPS' ID for a Event object based off the 
        event ID prefix.
        """
        self.emap_index, gid = self.__find_next_gramps_id(self.event_prefix,
@@ -636,7 +588,7 @@ class DbBsddbRead(DbReadBase, Callback):

    def find_next_object_gramps_id(self):
        """
-        Return the next available Gramps ID for a MediaObject object based
+        Return the next available GRAMPS' ID for a MediaObject object based
        off the media object ID prefix.
        """
        self.omap_index, gid = self.__find_next_gramps_id(self.mediaobject_prefix,
@@ -645,7 +597,7 @@ class DbBsddbRead(DbReadBase, Callback):

    def find_next_source_gramps_id(self):
        """
-        Return the next available Gramps ID for a Source object based off the 
+        Return the next available GRAMPS' ID for a Source object based off the 
        source ID prefix.
        """
        self.smap_index, gid = self.__find_next_gramps_id(self.source_prefix,
@@ -654,7 +606,7 @@ class DbBsddbRead(DbReadBase, Callback):

    def find_next_citation_gramps_id(self):
        """
-        Return the next available Gramps ID for a Source object based off the 
+        Return the next available GRAMPS' ID for a Source object based off the 
        source ID prefix.
        """
        self.cmap_index, gid = self.__find_next_gramps_id(self.citation_prefix,
@@ -663,7 +615,7 @@ class DbBsddbRead(DbReadBase, Callback):

    def find_next_family_gramps_id(self):
        """
-        Return the next available Gramps ID for a Family object based off the 
+        Return the next available GRAMPS' ID for a Family object based off the 
        family ID prefix.
        """
        self.fmap_index, gid = self.__find_next_gramps_id(self.family_prefix,
@@ -672,7 +624,7 @@ class DbBsddbRead(DbReadBase, Callback):

    def find_next_repository_gramps_id(self):
        """
-        Return the next available Gramps ID for a Respository object based 
+        Return the next available GRAMPS' ID for a Respository object based 
        off the repository ID prefix.
        """
        self.rmap_index, gid = self.__find_next_gramps_id(self.repository_prefix,
@@ -681,7 +633,7 @@ class DbBsddbRead(DbReadBase, Callback):

    def find_next_note_gramps_id(self):
        """
-        Return the next available Gramps ID for a Note object based off the 
+        Return the next available GRAMPS' ID for a Note object based off the 
        note ID prefix.
        """
        self.nmap_index, gid = self.__find_next_gramps_id(self.note_prefix,
@@ -715,7 +667,7 @@ class DbBsddbRead(DbReadBase, Callback):
    def get_from_name_and_gramps_id(self, table_name, gramps_id):
        """
        Returns a gen.lib object (or None) given table_name and
-        Gramps ID.
+        gramps ID.

        Examples:

@@ -834,7 +786,7 @@ class DbBsddbRead(DbReadBase, Callback):

    def get_person_from_gramps_id(self, val):
        """
-        Find a Person in the database from the passed Gramps ID.
+        Find a Person in the database from the passed gramps' ID.
        
        If no such Person exists, None is returned.
        """
@@ -843,7 +795,7 @@ class DbBsddbRead(DbReadBase, Callback):

    def get_family_from_gramps_id(self, val):
        """
-        Find a Family in the database from the passed Gramps ID.
+        Find a Family in the database from the passed gramps' ID.
        
        If no such Family exists, None is return.
        """
@@ -852,7 +804,7 @@ class DbBsddbRead(DbReadBase, Callback):
    
    def get_event_from_gramps_id(self, val):
        """
-        Find an Event in the database from the passed Gramps ID.
+        Find an Event in the database from the passed gramps' ID.
        
        If no such Family exists, None is returned.
        """
@@ -861,7 +813,7 @@ class DbBsddbRead(DbReadBase, Callback):

    def get_place_from_gramps_id(self, val):
        """
-        Find a Place in the database from the passed Gramps ID.
+        Find a Place in the database from the passed gramps' ID.
        
        If no such Place exists, None is returned.
        """
@@ -870,7 +822,7 @@ class DbBsddbRead(DbReadBase, Callback):

    def get_source_from_gramps_id(self, val):
        """
-        Find a Source in the database from the passed Gramps ID.
+        Find a Source in the database from the passed gramps' ID.
        
        If no such Source exists, None is returned.
        """
@@ -879,7 +831,7 @@ class DbBsddbRead(DbReadBase, Callback):

    def get_citation_from_gramps_id(self, val):
        """
-        Find a Citation in the database from the passed Gramps ID.
+        Find a Citation in the database from the passed gramps' ID.
        
        If no such Citation exists, None is returned.
        """
@@ -888,7 +840,7 @@ class DbBsddbRead(DbReadBase, Callback):

    def get_object_from_gramps_id(self, val):
        """
-        Find a MediaObject in the database from the passed Gramps ID.
+        Find a MediaObject in the database from the passed gramps' ID.
        
        If no such MediaObject exists, None is returned.
        """
@@ -897,7 +849,7 @@ class DbBsddbRead(DbReadBase, Callback):

    def get_repository_from_gramps_id(self, val):
        """
-        Find a Repository in the database from the passed Gramps ID.
+        Find a Repository in the database from the passed gramps' ID.
        
        If no such Repository exists, None is returned.
        """
@@ -906,7 +858,7 @@ class DbBsddbRead(DbReadBase, Callback):

    def get_note_from_gramps_id(self, val):
        """
-        Find a Note in the database from the passed Gramps ID.
+        Find a Note in the database from the passed gramps' ID.
        
        If no such Note exists, None is returned.
        """
@@ -1029,10 +981,9 @@ class DbBsddbRead(DbReadBase, Callback):

    def all_handles(self, table):
        """ return all the keys of a database table
-
-        .. warning:: For speed the keys are directly returned, so on python3 
-                     bytestrings are returned! Use constfunc.py handle2internal
-                     on this result!
+        CAREFUL: For speed the keys are directly returned, so on python3 
+                 bytestrings are returned! Use constfunc.py handle2internal
+                 on this result!
        """
        return table.keys(txn=self.txn)
        
@@ -1043,9 +994,9 @@ class DbBsddbRead(DbReadBase, Callback):
        
        If sort_handles is True, the list is sorted by surnames.
        
-        .. warning:: For speed the keys are directly returned, so on python3 
-                     bytestrings are returned! Use constfunc.py handle2internal
-                     on this result!
+        CAREFUL: For speed the keys are directly returned, so on python3 
+                 bytestrings are returned! Use constfunc.py handle2internal
+                 on this result!
        """
        if self.db_is_open:
            handle_list = self.all_handles(self.person_map)
@@ -1061,9 +1012,9 @@ class DbBsddbRead(DbReadBase, Callback):
        
        If sort_handles is True, the list is sorted by Place title.
        
-        .. warning:: For speed the keys are directly returned, so on python3 
-                     bytestrings are returned! Use constfunc.py handle2internal
-                     on this result!
+        CAREFUL: For speed the keys are directly returned, so on python3 
+                 bytestrings are returned! Use constfunc.py handle2internal
+                 on this result!
        """

        if self.db_is_open:
@@ -1080,9 +1031,9 @@ class DbBsddbRead(DbReadBase, Callback):
        
        If sort_handles is True, the list is sorted by Source title.
        
-        .. warning:: For speed the keys are directly returned, so on python3 
-                     bytestrings are returned! Use constfunc.py handle2internal
-                     on this result!
+        CAREFUL: For speed the keys are directly returned, so on python3 
+                 bytestrings are returned! Use constfunc.py handle2internal
+                 on this result!
        """
        if self.db_is_open:
            handle_list = self.all_handles(self.source_map)
@@ -1098,9 +1049,9 @@ class DbBsddbRead(DbReadBase, Callback):
        
        If sort_handles is True, the list is sorted by Citation Volume/Page.
        
-        .. warning:: For speed the keys are directly returned, so on python3 
-                     bytestrings are returned! Use constfunc.py handle2internal
-                     on this result!
+        CAREFUL: For speed the keys are directly returned, so on python3 
+                 bytestrings are returned! Use constfunc.py handle2internal
+                 on this result!
        """
        if self.db_is_open:
            handle_list = self.all_handles(self.citation_map)
@@ -1116,9 +1067,9 @@ class DbBsddbRead(DbReadBase, Callback):
        
        If sort_handles is True, the list is sorted by title.
        
-        .. warning:: For speed the keys are directly returned, so on python3 
-                     bytestrings are returned! Use constfunc.py handle2internal
-                     on this result!
+        CAREFUL: For speed the keys are directly returned, so on python3 
+                 bytestrings are returned! Use constfunc.py handle2internal
+                 on this result!
        """
        if self.db_is_open:
            handle_list = self.all_handles(self.media_map)
@@ -1132,9 +1083,9 @@ class DbBsddbRead(DbReadBase, Callback):
        Return a list of database handles, one handle for each Event in the 
        database. 
        
-        .. warning:: For speed the keys are directly returned, so on python3 
-                     bytestrings are returned! Use constfunc.py handle2internal
-                     on this result!
+        CAREFUL: For speed the keys are directly returned, so on python3 
+                 bytestrings are returned! Use constfunc.py handle2internal
+                 on this result!
        """
        if self.db_is_open:
            return self.all_handles(self.event_map)
@@ -1145,9 +1096,9 @@ class DbBsddbRead(DbReadBase, Callback):
        Return a list of database handles, one handle for each Family in
        the database.
        
-        .. warning:: For speed the keys are directly returned, so on python3 
-                     bytestrings are returned! Use constfunc.py handle2internal
-                     on this result!
+        CAREFUL: For speed the keys are directly returned, so on python3 
+                 bytestrings are returned! Use constfunc.py handle2internal
+                 on this result!
        """
        if self.db_is_open:
            return self.all_handles(self.family_map)
@@ -1158,9 +1109,9 @@ class DbBsddbRead(DbReadBase, Callback):
        Return a list of database handles, one handle for each Repository in
        the database.
        
-        .. warning:: For speed the keys are directly returned, so on python3 
-                     bytestrings are returned! Use constfunc.py handle2internal
-                     on this result!
+        CAREFUL: For speed the keys are directly returned, so on python3 
+                 bytestrings are returned! Use constfunc.py handle2internal
+                 on this result!
        """
        if self.db_is_open:
            return self.all_handles(self.repository_map)
@@ -1171,9 +1122,9 @@ class DbBsddbRead(DbReadBase, Callback):
        Return a list of database handles, one handle for each Note in the 
        database.
        
-        .. warning:: For speed the keys are directly returned, so on python3 
-                     bytestrings are returned! Use constfunc.py handle2internal
-                     on this result!
+        CAREFUL: For speed the keys are directly returned, so on python3 
+                 bytestrings are returned! Use constfunc.py handle2internal
+                 on this result!
        """
        if self.db_is_open:
            return self.all_handles(self.note_map)
@@ -1186,9 +1137,9 @@ class DbBsddbRead(DbReadBase, Callback):
        
        If sort_handles is True, the list is sorted by Tag name.
        
-        .. warning:: For speed the keys are directly returned, so on python3 
-                     bytestrings are returned! Use constfunc.py handle2internal
-                     on this result!
+        CAREFUL: For speed the keys are directly returned, so on python3 
+                 bytestrings are returned! Use constfunc.py handle2internal
+                 on this result!
        """
        if self.db_is_open:
            handle_list = self.all_handles(self.tag_map)
@@ -1339,7 +1290,7 @@ class DbBsddbRead(DbReadBase, Callback):

    def set_person_id_prefix(self, val):
        """
-        Set the naming template for Gramps Person ID values. 
+        Set the naming template for GRAMPS Person ID values. 
        
        The string is expected to be in the form of a simple text string, or 
        in a format that contains a C/Python style format string using %d, 
@@ -1350,7 +1301,7 @@ class DbBsddbRead(DbReadBase, Callback):

    def set_source_id_prefix(self, val):
        """
-        Set the naming template for Gramps Source ID values. 
+        Set the naming template for GRAMPS Source ID values. 
        
        The string is expected to be in the form of a simple text string, or 
        in a format that contains a C/Python style format string using %d, 
@@ -1361,7 +1312,7 @@ class DbBsddbRead(DbReadBase, Callback):
            
    def set_citation_id_prefix(self, val):
        """
-        Set the naming template for Gramps Citation ID values. 
+        Set the naming template for GRAMPS Citation ID values. 
        
        The string is expected to be in the form of a simple text string, or 
        in a format that contains a C/Python style format string using %d, 
@@ -1372,7 +1323,7 @@ class DbBsddbRead(DbReadBase, Callback):
            
    def set_object_id_prefix(self, val):
        """
-        Set the naming template for Gramps MediaObject ID values. 
+        Set the naming template for GRAMPS MediaObject ID values. 
        
        The string is expected to be in the form of a simple text string, or 
        in a format that contains a C/Python style format string using %d, 
@@ -1383,7 +1334,7 @@ class DbBsddbRead(DbReadBase, Callback):

    def set_place_id_prefix(self, val):
        """
-        Set the naming template for Gramps Place ID values. 
+        Set the naming template for GRAMPS Place ID values. 
        
        The string is expected to be in the form of a simple text string, or 
        in a format that contains a C/Python style format string using %d, 
@@ -1394,7 +1345,7 @@ class DbBsddbRead(DbReadBase, Callback):

    def set_family_id_prefix(self, val):
        """
-        Set the naming template for Gramps Family ID values. The string is
+        Set the naming template for GRAMPS Family ID values. The string is
        expected to be in the form of a simple text string, or in a format
        that contains a C/Python style format string using %d, such as F%d
        or F%04d.
@@ -1404,7 +1355,7 @@ class DbBsddbRead(DbReadBase, Callback):

    def set_event_id_prefix(self, val):
        """
-        Set the naming template for Gramps Event ID values. 
+        Set the naming template for GRAMPS Event ID values. 
        
        The string is expected to be in the form of a simple text string, or 
        in a format that contains a C/Python style format string using %d, 
@@ -1415,7 +1366,7 @@ class DbBsddbRead(DbReadBase, Callback):

    def set_repository_id_prefix(self, val):
        """
-        Set the naming template for Gramps Repository ID values. 
+        Set the naming template for GRAMPS Repository ID values. 
        
        The string is expected to be in the form of a simple text string, or 
        in a format that contains a C/Python style format string using %d, 
@@ -1426,7 +1377,7 @@ class DbBsddbRead(DbReadBase, Callback):

    def set_note_id_prefix(self, val):
        """
-        Set the naming template for Gramps Note ID values. 
+        Set the naming template for GRAMPS Note ID values. 
        
        The string is expected to be in the form of a simple text string, or 
        in a format that contains a C/Python style format string using %d, 
@@ -1531,24 +1482,12 @@ class DbBsddbRead(DbReadBase, Callback):
        """Set the save path for the database."""
        self.path = path

-    def get_event_attribute_types(self):
-        """
-        Return a list of all Attribute types assocated with Event instances
-        in the database.
-        """
-        return list(self.event_attributes)
-
-    def get_event_types(self):
-        """
-        Return a list of all event types in the database.
-        """
-        return list(self.event_names)
-
    def get_person_event_types(self):
        """
-        Deprecated:  Use get_event_types
+        Return a list of all Event types assocated with Person instances in 
+        the database.
        """
-        return list(self.event_names)
+        return list(self.individual_event_names)

    def get_person_attribute_types(self):
        """
@@ -1566,9 +1505,10 @@ class DbBsddbRead(DbReadBase, Callback):

    def get_family_event_types(self):
        """
-        Deprecated:  Use get_event_types
+        Return a list of all Event types assocated with Family instances in 
+        the database.
        """
-        return list(self.event_names)
+        return list(self.family_event_names)

    def get_media_attribute_types(self):
        """
@@ -1626,13 +1566,6 @@ class DbBsddbRead(DbReadBase, Callback):
        """
        return list(self.note_types)

-    def get_source_attribute_types(self):
-        """
-        Return a list of all Attribute types assocated with Source/Citation
-        instances in the database.
-        """
-        return list(self.source_attributes)
-
    def get_source_media_types(self):
        """
        Return a list of all custom source media types assocated with Source 
@@ -1647,13 +1580,6 @@ class DbBsddbRead(DbReadBase, Callback):
        """
        return list(self.url_types)

-    def get_place_types(self):
-        """
-        Return a list of all custom place types assocated with Place instances
-        in the database.
-        """
-        return list(self.place_types)
-
    def __log_error(self):
        pass            

@@ -1667,6 +1593,10 @@ class DbBsddbRead(DbReadBase, Callback):
            handle = handle.encode('utf-8')
        try:
            return table.get(handle, txn=self.txn)
+        except UnicodeDecodeError:
+            #we need to assume we opened data in python3 saved in python2
+            raw = table.db.get(handle, txn=self.txn)
+            return pickle.loads(raw, encoding='utf-8')
        except DBERRS as msg:
            self.__log_error()
            raise DbError(msg)
@@ -18,6 +18,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

+# $Id$
+
 import unittest
 import os
 import sys
@@ -31,8 +33,6 @@ if config.get('preferences.use-bsddb3') or sys.version_info[0] >= 3:
 else:
    from bsddb import dbshelve, db

-from ..read import DbBsddbTreeCursor
-
 class Data(object):

    def __init__(self, handle,surname, name):
@@ -78,7 +78,6 @@ class CursorTest(unittest.TestCase):
            os.mkdir(env_name)
        self.env.open(env_name,env_flags)
        (self.person_map,self.surnames) = self._open_tables()
-        (self.place_map, self.placerefs) = self._open_treetables()
        
    def _open_tables(self):
        dbmap = dbshelve.DBShelf(self.env)
@@ -103,36 +102,10 @@ class CursorTest(unittest.TestCase):
        person_map.associate(surnames, find_surname, table_flags)

        return (person_map,surnames)
-
-    def _open_treetables(self):
-        dbmap = dbshelve.DBShelf(self.env)
-        dbmap.db.set_pagesize(16384)
-        dbmap.open(self.full_name, 'places', db.DB_HASH,
-                       db.DB_CREATE|db.DB_AUTO_COMMIT, 0o666)
-        place_map     = dbmap
-
-        table_flags = db.DB_CREATE|db.DB_AUTO_COMMIT
-
-        placerefs = db.DB(self.env)
-        placerefs.set_flags(db.DB_DUP|db.DB_DUPSORT)
-        placerefs.open(self.full_name, "placerefs", db.DB_BTREE,
-                               flags=table_flags)
-
-        def find_placeref(key,data):
-            val = data[2]
-            if isinstance(val, UNITYPE):
-                val = val.encode('utf-8')
-            return val
-
-        place_map.associate(placerefs, find_placeref, table_flags)
-
-        return (place_map, placerefs)
-
+    
    def tearDown(self):
        self.person_map.close()
        self.surnames.close()
-        self.place_map.close()
-        self.placerefs.close()
        self.env.close()
        shutil.rmtree(self._tmpdir)
        
@@ -212,29 +185,7 @@ class CursorTest(unittest.TestCase):

        self.assertEqual(v.handle, data.handle)

-    def test_treecursor(self):
-        #fill with data
-        the_txn = self.env.txn_begin()
-        data = [(b'1', 'countryA',  ''  ),
-                (b'2', 'localityA', '1' ),
-                (b'3', 'localityB', '1' ),
-                (b'4', 'countryB',  ''  ),
-                (b'5', 'streetA',   '2' ),
-                (b'6', 'countryB',  ''  )]
-        for d in data:
-            self.place_map.put(d[0], d, txn=the_txn)
-        the_txn.commit()
-
-        cursor_txn = self.env.txn_begin()
-        cursor = DbBsddbTreeCursor(self.placerefs, self.place_map, False,
-                                   cursor_txn)
-        placenames = set([d[1] for handle, d in cursor])
        
-        cursor.close()
-        cursor_txn.commit()
-        pldata = set([d[1] for d in data])
-        self.assertEqual(placenames, pldata)
-
 def testSuite():
    suite = unittest.makeSuite(CursorTest, 'test')
    return suite
@@ -18,6 +18,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

+# $Id$
+
 import unittest

 from .. import DbReadBase, DbWriteBase, DbBsddbRead, DbBsddb
@@ -43,17 +45,16 @@ class DbTest(unittest.TestCase):
        "get_child_reference_types",
        "get_default_handle",
        "get_default_person",
-        "get_event_attribute_types",
        "get_event_bookmarks",
        "get_event_cursor",
        "get_event_from_gramps_id",
        "get_event_from_handle",
        "get_event_handles",
        "get_event_roles",
-        "get_event_types",
        "get_family_attribute_types",
        "get_family_bookmarks",
        "get_family_cursor",
+        "get_family_event_types",
        "get_family_from_gramps_id",
        "get_family_from_handle",
        "get_family_handles",
@@ -87,6 +88,7 @@ class DbTest(unittest.TestCase):
        "get_object_from_handle",
        "get_person_attribute_types",
        "get_person_cursor",
+        "get_person_event_types",
        "get_person_from_gramps_id",
        "get_person_from_handle",
        "get_person_handles",
@@ -183,9 +185,11 @@ class DbTest(unittest.TestCase):
    WRITE_METHODS = [
        "add_event",
        "add_family",
+        "add_family_event",
        "add_note",
        "add_object",
        "add_person",
+        "add_person_event",
        "add_place",
        "add_repository",
        "add_source",
@@ -195,9 +199,11 @@ class DbTest(unittest.TestCase):
        "commit_base",
        "commit_event",
        "commit_family",
+        "commit_family_event",
        "commit_media_object",
        "commit_note",
        "commit_person",
+        "commit_personal_event",
        "commit_place",
        "commit_repository",
        "commit_source",
@@ -18,6 +18,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

+# $Id$
+
 from __future__ import print_function

 import unittest
@@ -18,6 +18,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

+# $Id$
+
 import unittest
 import logging
 import time
@@ -18,6 +18,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

+# $Id$
+
 """
 Exports the DbTxn class for managing Gramps transactions and the undo
 database.
--- a/Show More
+++ b/Show More