From 31962a0e281c1471d502e09ce992cfa4bc63e8b5 Mon Sep 17 00:00:00 2001 From: Jean Raby Date: Mon, 9 Jan 2012 17:18:11 +0000 Subject: [PATCH] Drop pytz as recent version doesn't work correctly with vobject. Use dateutil.tz instead. Monotone-Parent: cec86bee0b5e2a1fc741887d9b9e535436381c6e Monotone-Revision: b34c698acd51d633a7d276d6fbbcab8a47e7e460 Monotone-Author: jraby@inverse.ca Monotone-Date: 2012-01-09T17:18:11 Monotone-Branch: ca.inverse.sogo --- Tests/Integration/README | 2 +- Tests/Integration/test-caldav-scheduling.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Tests/Integration/README b/Tests/Integration/README index ca98c90c0..fdbf331c7 100644 --- a/Tests/Integration/README +++ b/Tests/Integration/README @@ -1,7 +1,7 @@ setup ----- -(you need "python-simplejson", "python-xml", "python-vobject" and "python-m2crypto" +(you need "python-simplejson", "python-xml", "python-vobject", "python-dateutil" and "python-m2crypto" in order to run the scripts on Debian) 1) copy config.py.in to config.py (make sure to never EVER add it to monotone) diff --git a/Tests/Integration/test-caldav-scheduling.py b/Tests/Integration/test-caldav-scheduling.py index a9fb92249..1fbd92b8e 100755 --- a/Tests/Integration/test-caldav-scheduling.py +++ b/Tests/Integration/test-caldav-scheduling.py @@ -8,10 +8,10 @@ from config import hostname, port, username, password, \ resource_no_overbook, resource_can_overbook import datetime +import dateutil.tz import sogotests import sys import time -import pytz import unittest import utilities import vobject @@ -143,7 +143,7 @@ class CalDAVITIPDelegationTest(unittest.TestCase): vevent.add('summary').value = summary vevent.add('transp').value = transparency[transp] - now = datetime.datetime.now(pytz.timezone("America/Montreal")) + now = datetime.datetime.now(dateutil.tz.gettz("America/Montreal")) startdate = vevent.add('dtstart') startdate.value = now enddate = vevent.add('dtend')