Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renamed gramps.gen.lib.calendar to gramps.gen.lib.gcalendar to avoid import conflict with Python lib calendar

Browse Source
This commit is contained in:
Doug Blank 2015-01-04 12:33:06 -05:00
parent f4abd460ba
commit 66fd541eea
5 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gramps/gen/lib/date.py
View File

@ -53,7 +53,7 @@ log = logging.getLogger(".Date")
from ..const import GRAMPS_LOCALE as glocale from ..const import GRAMPS_LOCALE as glocale
_ = glocale.translation.sgettext _ = glocale.translation.sgettext
from .calendar import (gregorian_sdn, julian_sdn, hebrew_sdn, from .gcalendar import (gregorian_sdn, julian_sdn, hebrew_sdn,
french_sdn, persian_sdn, islamic_sdn, swedish_sdn, french_sdn, persian_sdn, islamic_sdn, swedish_sdn,
gregorian_ymd, julian_ymd, hebrew_ymd, gregorian_ymd, julian_ymd, hebrew_ymd,
french_ymd, persian_ymd, islamic_ymd, french_ymd, persian_ymd, islamic_ymd,

0
gramps/gen/lib/calendar.py → gramps/gen/lib/gcalendar.py
View File

2
gramps/plugins/lib/libholiday.py
View File

@ -28,7 +28,7 @@ from __future__ import print_function
from gramps.gen.const import GRAMPS_LOCALE as glocale from gramps.gen.const import GRAMPS_LOCALE as glocale
_ = glocale.translation.gettext _ = glocale.translation.gettext
from xml.parsers import expat from xml.parsers import expat
from gramps.gen.lib.calendar import (gregorian_ymd, hebrew_sdn) from gramps.gen.lib.gcalendar import (gregorian_ymd, hebrew_sdn)
import datetime import datetime
import math import math
from gramps.gen.const import PLUGINS_DIR, USER_PLUGINS from gramps.gen.const import PLUGINS_DIR, USER_PLUGINS

3
gramps/plugins/webreport/webcal.py
View File

@ -33,7 +33,8 @@ Web Calendar generator.
#------------------------------------------------------------------------ #------------------------------------------------------------------------
from functools import partial from functools import partial
import os, codecs, shutil, re, sys import os, codecs, shutil, re, sys
import datetime, calendar import datetime
import calendar # Python module
#------------------------------------------------------------------------ #------------------------------------------------------------------------
# Set up logging # Set up logging

2
po/POTFILES.skip
View File

@ -128,7 +128,7 @@ gramps/gen/lib/addressbase.py
gramps/gen/lib/attrbase.py gramps/gen/lib/attrbase.py
gramps/gen/lib/attribute.py gramps/gen/lib/attribute.py
gramps/gen/lib/baseobj.py gramps/gen/lib/baseobj.py
gramps/gen/lib/calendar.py gramps/gen/lib/gcalendar.py
gramps/gen/lib/childref.py gramps/gen/lib/childref.py
gramps/gen/lib/citationbase.py gramps/gen/lib/citationbase.py
gramps/gen/lib/citation.py gramps/gen/lib/citation.py