7582: Cannot remove a primary object having a new created backreference

This removes the create_id method from gen/db/write.py, since
after a recent "from __future__ import unicode_literals" (there)
it started producing unicode.  Instead the create_id method in
gen/utils/id.py is used, as its code is essentially identical,
in use in many other places -- and does not produce unicode.
This commit is contained in:
Paul Franklin
2014-05-03 07:00:51 -07:00
parent 92f5a5e36c
commit 2a608151c2
5 changed files with 40 additions and 37 deletions

View File

@@ -85,6 +85,7 @@ from . import (DbBsddbRead, DbWriteBase, BSDDBTxn,
from .dbconst import *
from ..utils.callback import Callback
from ..utils.cast import conv_dbstr_to_unicode
from ..utils.id import create_id
from ..updatecallback import UpdateCallback
from ..errors import DbError
from ..constfunc import (win, conv_to_unicode, cuni, UNITYPE, handle2internal,
@@ -1552,15 +1553,11 @@ class DbBsddb(DbBsddbRead, DbWriteBase, UpdateCallback):
except IOError:
pass
def create_id(self):
return "%08x%08x" % ( int(time.time()*10000),
self.rand.randint(0, maxsize))
def __add_object(self, obj, transaction, find_next_func, commit_func):
if find_next_func and not obj.gramps_id:
obj.gramps_id = find_next_func()
if not obj.handle:
obj.handle = self.create_id()
obj.handle = create_id()
commit_func(obj, transaction)
return obj.handle