Removal of redundant SourceRef and related modules. Minor consequent changes.

svn: r18516
This commit is contained in:
Tim G L Lyons
2011-11-27 17:49:25 +00:00
parent bafe7870c7
commit 26cb74474b
16 changed files with 19 additions and 906 deletions

View File

@@ -26,7 +26,7 @@ Contain and organize bibliographic information.
"""
import string
import math
from gen.lib import SourceRef
import gen.lib
class Citation(object):
"""
@@ -212,7 +212,8 @@ class Bibliography(object):
return True
if ( self.mode & self.MODE_CONF ) == self.MODE_CONF:
confidence = source_ref.get_confidence_level()
if confidence is not None and confidence != SourceRef.CONF_NORMAL:
if confidence is not None and confidence != \
gen.lib.Citation.CONF_NORMAL:
return True
if ( self.mode & self.MODE_NOTE ) == self.MODE_NOTE:
if len(source_ref.get_note_list()) != 0:

View File

@@ -27,7 +27,7 @@
Provide utilities for printing endnotes in text reports.
"""
from gen.plug.docgen import FontStyle, ParagraphStyle, FONT_SANS_SERIF
from gen.lib import NoteType, SourceRef
from gen.lib import NoteType, Citation
from gen.ggettext import gettext as _
from Utils import confidence
from DateHandler import displayer
@@ -84,7 +84,7 @@ def cite_source(bibliography, database, obj):
@param bibliography: The bibliography to contain the citations.
@type bibliography: L{Bibliography}
@param obj: An object with source references.
@type obj: L{gen.lib.srcbase}
@type obj: L{gen.lib.CitationBase}
"""
txt = ""
slist = obj.get_citation_list()
@@ -188,7 +188,7 @@ def _format_ref_text(ref, key):
ref_txt = ref.get_page()
# Print only confidence level if it is not Normal
if ref.get_confidence_level() != SourceRef.CONF_NORMAL:
if ref.get_confidence_level() != Citation.CONF_NORMAL:
ref_txt += " [" + confidence[ref.get_confidence_level()] + "]"
return ref_txt