|
Line
Link Here
|
| 0 |
-- src/DbManager.py |
0 |
++ src/DbManager.py |
|
Lines 129-135
Link Here
|
| 129 |
Returns (people_count, version_number) of current DB. |
129 |
Returns (people_count, version_number) of current DB. |
| 130 |
Returns ("Unknown", "Unknown") if invalid DB or other error. |
130 |
Returns ("Unknown", "Unknown") if invalid DB or other error. |
| 131 |
""" |
131 |
""" |
| 132 |
from bsddb import dbshelve, db |
132 |
from bsddb3 import dbshelve, db |
| 133 |
from gen.db import META, PERSON_TBL |
133 |
from gen.db import META, PERSON_TBL |
| 134 |
env = db.DBEnv() |
134 |
env = db.DBEnv() |
| 135 |
flags = db.DB_CREATE | db.DB_PRIVATE |\ |
135 |
flags = db.DB_CREATE | db.DB_PRIVATE |\ |
| 136 |
-- src/Editors/_EditFamily.py |
136 |
++ src/Editors/_EditFamily.py |
|
Lines 26-32
Link Here
|
| 26 |
# python modules |
26 |
# python modules |
| 27 |
# |
27 |
# |
| 28 |
#------------------------------------------------------------------------- |
28 |
#------------------------------------------------------------------------- |
| 29 |
from bsddb import db as bsddb_db |
29 |
from bsddb3 import db as bsddb_db |
| 30 |
from gettext import gettext as _ |
30 |
from gettext import gettext as _ |
| 31 |
from DdTargets import DdTargets |
31 |
from DdTargets import DdTargets |
| 32 |
import pickle |
32 |
import pickle |
| 33 |
-- src/gen/db/base.py |
33 |
++ src/gen/db/base.py |
|
Lines 36-42
Link Here
|
| 36 |
import locale |
36 |
import locale |
| 37 |
import os |
37 |
import os |
| 38 |
from sys import maxint |
38 |
from sys import maxint |
| 39 |
from bsddb import db |
39 |
from bsddb3 import db |
| 40 |
from gettext import gettext as _ |
40 |
from gettext import gettext as _ |
| 41 |
|
41 |
|
| 42 |
import logging |
42 |
import logging |
| 43 |
-- src/gen/db/dbdir.py |
43 |
++ src/gen/db/dbdir.py |
|
Lines 37-43
Link Here
|
| 37 |
from types import InstanceType |
37 |
from types import InstanceType |
| 38 |
|
38 |
|
| 39 |
from gettext import gettext as _ |
39 |
from gettext import gettext as _ |
| 40 |
from bsddb import dbshelve, db |
40 |
from bsddb3 import dbshelve, db |
| 41 |
import logging |
41 |
import logging |
| 42 |
|
42 |
|
| 43 |
_LOG = logging.getLogger(".GrampsDb") |
43 |
_LOG = logging.getLogger(".GrampsDb") |
| 44 |
-- src/GrampsLogger/_ErrorReportAssistant.py |
44 |
++ src/GrampsLogger/_ErrorReportAssistant.py |
|
Lines 2-8
Link Here
|
| 2 |
import Assistant |
2 |
import Assistant |
| 3 |
import const |
3 |
import const |
| 4 |
import gtk |
4 |
import gtk |
| 5 |
import sys, os,bsddb |
5 |
import sys, os, bsddb3 |
| 6 |
|
6 |
|
| 7 |
|
7 |
|
| 8 |
|
8 |
|
|
Lines 99-105
Link Here
|
| 99 |
"OS: %s\n"\ |
99 |
"OS: %s\n"\ |
| 100 |
"Distribution: %s\n"\ |
100 |
"Distribution: %s\n"\ |
| 101 |
% (str(sys.version).replace('\n',''), |
101 |
% (str(sys.version).replace('\n',''), |
| 102 |
str(bsddb.__version__), |
102 |
str(bsddb3.__version__), |
| 103 |
str(const.VERSION), |
103 |
str(const.VERSION), |
| 104 |
os.environ.get('LANG',''), |
104 |
os.environ.get('LANG',''), |
| 105 |
operatingsystem, |
105 |
operatingsystem, |
| 106 |
-- src/plugins/import/ImportGrdb.py |
106 |
++ src/plugins/import/ImportGrdb.py |
|
Lines 35-41
Link Here
|
| 35 |
from gettext import gettext as _ |
35 |
from gettext import gettext as _ |
| 36 |
import cPickle as pickle |
36 |
import cPickle as pickle |
| 37 |
import time |
37 |
import time |
| 38 |
from bsddb import dbshelve, db |
38 |
from bsddb3 import dbshelve, db |
| 39 |
import logging |
39 |
import logging |
| 40 |
__LOG = logging.getLogger(".GrampsDb") |
40 |
__LOG = logging.getLogger(".GrampsDb") |
| 41 |
|
41 |
|
