Skip to content

Commit e184a7e

Browse files
authored
Merge pull request #35 from lucc/stdout
Use logging instead of printing to stdout.
2 parents f19150b + afdd48e commit e184a7e

File tree

1 file changed

+14
-11
lines changed

1 file changed

+14
-11
lines changed

vobject/icalendar.py

+14-11
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@
22

33
from __future__ import print_function
44

5+
import codecs
56
import datetime
7+
import logging
68
import random # for generating a UID
7-
import six
89
import socket
910
import string
10-
import codecs
1111

1212
from dateutil import rrule, tz
13+
import six
1314

1415
try:
1516
import pytz
@@ -29,8 +30,8 @@ class NonExistentTimeError(Exception):
2930

3031
from . import behavior
3132
from .base import (VObjectError, NativeError, ValidateError, ParseError,
32-
Component, ContentLine, logger, registerBehavior,
33-
backslashEscape, foldOneLine, str_)
33+
Component, ContentLine, logger, registerBehavior,
34+
backslashEscape, foldOneLine, str_)
3435

3536

3637
# ------------------------------- Constants ------------------------------------
@@ -76,9 +77,9 @@ def getTzid(tzid, smart=True):
7677
tz = timezone(tzid)
7778
registerTzid(toUnicode(tzid), tz)
7879
except UnknownTimeZoneError as e:
79-
print("Error: {0}".format(e))
80+
logging.error(e)
8081
except ImportError as e:
81-
print("Error: {0}".format(e))
82+
logging.error(e)
8283
return tz
8384

8485
utc = tz.tzutc()
@@ -428,11 +429,11 @@ def getrruleset(self, addRDate = False):
428429
dtstart = self.due.value
429430
else:
430431
# if there's no dtstart, just return None
431-
print('failed to get dtstart with VTODO')
432+
logging.error('failed to get dtstart with VTODO')
432433
return None
433434
except (AttributeError, KeyError):
434435
# if there's no due, just return None
435-
print('failed to find DUE at all.')
436+
logging.error('failed to find DUE at all.')
436437
return None
437438

438439
# a Ruby iCalendar library escapes semi-colons in rrules,
@@ -1646,7 +1647,7 @@ def error(msg):
16461647
if strict:
16471648
raise ParseError(msg)
16481649
else:
1649-
print(msg)
1650+
logging.error(msg)
16501651

16511652
# vars which control state machine
16521653
charIterator = enumerate(s)
@@ -1698,7 +1699,8 @@ def error(msg):
16981699

16991700
else:
17001701
state = "error"
1701-
error("error: unknown state: '{0!s}' reached in {1!s}".format(state, s))
1702+
error("unknown state: '{0!s}' reached in {1!s}".format(state, s))
1703+
17021704

17031705
def stringToDurations(s, strict=False):
17041706
"""
@@ -1815,7 +1817,8 @@ def error(msg):
18151817

18161818
else:
18171819
state = "error"
1818-
error("error: unknown state: '{0!s}' reached in {1!s}".format(state, s))
1820+
error("unknown state: '{0!s}' reached in {1!s}".format(state, s))
1821+
18191822

18201823
def parseDtstart(contentline, allowSignatureMismatch=False):
18211824
"""

0 commit comments

Comments
 (0)