diff --git a/gramps/gen/lib/date.py b/gramps/gen/lib/date.py index edd3d29bd..8a672242e 100644 --- a/gramps/gen/lib/date.py +++ b/gramps/gen/lib/date.py @@ -53,7 +53,7 @@ log = logging.getLogger(".Date") from ..const import GRAMPS_LOCALE as glocale _ = 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, gregorian_ymd, julian_ymd, hebrew_ymd, french_ymd, persian_ymd, islamic_ymd, diff --git a/gramps/gen/lib/calendar.py b/gramps/gen/lib/gcalendar.py similarity index 100% rename from gramps/gen/lib/calendar.py rename to gramps/gen/lib/gcalendar.py diff --git a/gramps/plugins/lib/libholiday.py b/gramps/plugins/lib/libholiday.py index b0d385cb5..062a9676c 100644 --- a/gramps/plugins/lib/libholiday.py +++ b/gramps/plugins/lib/libholiday.py @@ -28,7 +28,7 @@ from __future__ import print_function from gramps.gen.const import GRAMPS_LOCALE as glocale _ = glocale.translation.gettext 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 math from gramps.gen.const import PLUGINS_DIR, USER_PLUGINS diff --git a/gramps/plugins/webreport/webcal.py b/gramps/plugins/webreport/webcal.py index ea6b64aa5..e21fcab2c 100644 --- a/gramps/plugins/webreport/webcal.py +++ b/gramps/plugins/webreport/webcal.py @@ -33,7 +33,8 @@ Web Calendar generator. #------------------------------------------------------------------------ from functools import partial import os, codecs, shutil, re, sys -import datetime, calendar +import datetime +import calendar # Python module #------------------------------------------------------------------------ # Set up logging diff --git a/po/POTFILES.skip b/po/POTFILES.skip index 718f0cdf0..1391b6877 100644 --- a/po/POTFILES.skip +++ b/po/POTFILES.skip @@ -128,7 +128,7 @@ gramps/gen/lib/addressbase.py gramps/gen/lib/attrbase.py gramps/gen/lib/attribute.py gramps/gen/lib/baseobj.py -gramps/gen/lib/calendar.py +gramps/gen/lib/gcalendar.py gramps/gen/lib/childref.py gramps/gen/lib/citationbase.py gramps/gen/lib/citation.py