GEPS008: Moved LdsUtils module
svn: r19902
This commit is contained in:
@@ -118,7 +118,7 @@ import gen.lib
|
||||
from gen.db import DbTxn
|
||||
from gen.updatecallback import UpdateCallback
|
||||
import gen.mime
|
||||
import LdsUtils
|
||||
from gen.utils.lds import TEMPLES
|
||||
import Utils
|
||||
from gen.datehandler._dateparser import DateParser
|
||||
from gen.db.dbconst import EVENT_KEY
|
||||
@@ -7136,10 +7136,10 @@ class GedcomParser(UpdateCallback):
|
||||
|
||||
def __extract_temple(self, line):
|
||||
def get_code(code):
|
||||
if LdsUtils.TEMPLES.is_valid_code(code):
|
||||
if TEMPLES.is_valid_code(code):
|
||||
return code
|
||||
elif LdsUtils.TEMPLES.is_valid_name(code):
|
||||
return LdsUtils.TEMPLES.code(code)
|
||||
elif TEMPLES.is_valid_name(code):
|
||||
return TEMPLES.code(code)
|
||||
|
||||
code = get_code(line.data)
|
||||
if code:
|
||||
|
||||
@@ -54,7 +54,7 @@ import gen.mime
|
||||
from gui.plug import tool
|
||||
import Utils
|
||||
from gui.utils import ProgressMeter
|
||||
import LdsUtils
|
||||
from gen.utils.lds import TEMPLES
|
||||
from gen.db.dbconst import *
|
||||
import const
|
||||
|
||||
@@ -1535,7 +1535,7 @@ class TestcaseGenerator(tool.BatchTool):
|
||||
|
||||
if isinstance(o,gen.lib.LdsOrd):
|
||||
if randint(0,1) == 1:
|
||||
o.set_temple( choice( LdsUtils.TEMPLES.name_code_data())[1])
|
||||
o.set_temple( choice(TEMPLES.name_code_data())[1])
|
||||
|
||||
if issubclass(o.__class__,gen.lib.ldsordbase.LdsOrdBase):
|
||||
while randint(0,1) == 1:
|
||||
|
||||
Reference in New Issue
Block a user