[tryton-debian-vcs] tryton-modules-calendar-scheduling branch upstream updated. upstream/3.4.1-1-g1749307
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Apr 23 16:03:10 UTC 2015
The following commit has been merged in the upstream branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-calendar-scheduling.git;a=commitdiff;h=upstream/3.4.1-1-g1749307
commit 1749307dbc5f0aeb5c04d6f634f310fbbdbc163f
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Apr 23 16:59:54 2015 +0200
Adding upstream version 3.6.0.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index 9fd25dd..bc726ee 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,6 @@
-Version 3.4.1 - 2015-03-01
+Version 3.6.0 - 2015-04-20
* Bug fixes (see mercurial logs for details)
-
+* Add support for PyPy
Version 3.4.0 - 2014-10-20
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 79de121..2ef1d69 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_calendar_scheduling
-Version: 3.4.1
+Version: 3.6.0
Summary: Tryton module to add scheduling support on CalDAV
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/3.4/
+Download-URL: http://downloads.tryton.org/3.6/
Description: trytond_calendar_scheduling
===========================
@@ -66,4 +66,6 @@ Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Programming Language :: Python :: Implementation :: PyPy
Classifier: Topic :: Office/Business
diff --git a/__init__.py b/__init__.py
index 01d1f79..19a9a0f 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,5 +1,5 @@
-#This file is part of Tryton. The COPYRIGHT file at the top level of
-#this repository contains the full copyright notices and license terms.
+# This file is part of Tryton. The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
from trytond.pool import Pool
from . import caldav
diff --git a/caldav.py b/caldav.py
index 7f2f1b8..12064c2 100644
--- a/caldav.py
+++ b/caldav.py
@@ -1,5 +1,5 @@
-#This file is part of Tryton. The COPYRIGHT file at the top level of
-#this repository contains the full copyright notices and license terms.
+# This file is part of Tryton. The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
from pywebdav.lib.constants import DAV_VERSION_1, DAV_VERSION_2
DAV_VERSION_1['version'] += ',calendar-auto-schedule'
diff --git a/calendar_.py b/calendar_.py
index 3b719aa..e656326 100644
--- a/calendar_.py
+++ b/calendar_.py
@@ -1,5 +1,5 @@
-#This file is part of Tryton. The COPYRIGHT file at the top level of
-#this repository contains the full copyright notices and license terms.
+# This file is part of Tryton. The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
from email.mime.base import MIMEBase
from email.mime.multipart import MIMEMultipart
import logging
@@ -12,6 +12,8 @@ from trytond.pool import Pool, PoolMeta
__all__ = ['Event', 'EventAttendee']
__metaclass__ = PoolMeta
+logger = logging.getLogger(__name__)
+
class Event:
__name__ = 'calendar.event'
@@ -241,8 +243,9 @@ class Event:
server.quit()
success = to_addrs
except Exception:
- logging.getLogger('calendar_scheduling').error(
- 'Unable to deliver scheduling mail for %s' % self)
+ logger.error(
+ 'Unable to deliver scheduling mail for %s', self,
+ exc_info=True)
return success
def attendees_to_notify(self):
@@ -373,7 +376,7 @@ class Event:
if event_edited:
if event.status == 'cancelled':
ical.method.value = 'CANCEL'
- #send cancel to old attendee
+ # send cancel to old attendee
subject, body = event.subject_body('cancel', owner)
msg = cls.create_msg(owner_email,
[a.email for a in old_attendees],
@@ -388,7 +391,7 @@ class Event:
else:
ical.method.value = 'REQUEST'
- #send update to old attendees
+ # send update to old attendees
subject, body = event.subject_body('update', owner)
msg = cls.create_msg(owner_email,
[a.email for a in old_attendees],
@@ -400,7 +403,7 @@ class Event:
sent_succes += old_attendees
else:
sent_fail += old_attendees
- #send new to new attendees
+ # send new to new attendees
subject, body = event.subject_body('new', owner)
msg = cls.create_msg(owner_email,
[a.email for a in new_attendees],
@@ -416,7 +419,7 @@ class Event:
else:
if event.status != 'cancelled':
ical.method.value = 'REQUEST'
- #send new to new attendees
+ # send new to new attendees
subject, body = event.subject_body('new', owner)
msg = cls.create_msg(owner_email,
[a.email for a in new_attendees],
@@ -696,8 +699,8 @@ class EventAttendee(AttendeeMixin, object):
server.quit()
success = True
except Exception:
- logging.getLogger('calendar_scheduling').error(
- 'Unable to deliver reply mail for %s' % self)
+ logger.error(
+ 'Unable to deliver reply mail for %s', self, exc_info=True)
return success
def organiser_to_notify(self):
diff --git a/locale/es_EC.po b/locale/es_EC.po
index e248df5..8ef2e56 100644
--- a/locale/es_EC.po
+++ b/locale/es_EC.po
@@ -10,7 +10,9 @@ msgctxt "error:calendar.event.attendee:"
msgid ""
"%s (%s) changed his/her participation status to: %s\n"
"\n"
-msgstr "%s (%s) cambió el estado de su participación a: %s\n"
+msgstr ""
+"%s (%s) cambió el estado de su participación a: %s\n"
+"\n"
msgctxt "error:calendar.event.attendee:"
msgid ""
@@ -30,7 +32,7 @@ msgstr "%s: %s @ %s"
msgctxt "error:calendar.event.attendee:"
msgid "(No Subject)"
-msgstr "(Sin Asunto)"
+msgstr "(Sin asunto)"
msgctxt "error:calendar.event.attendee:"
msgid ":"
@@ -54,7 +56,7 @@ msgstr ":"
msgctxt "error:calendar.event:"
msgid "Cancelled Event: %s @ %s"
-msgstr "Evento Cancelado: %s @ %s"
+msgstr "Evento cancelado: %s @ %s"
msgctxt "error:calendar.event:"
msgid "Invitation: %s @ %s"
@@ -88,19 +90,19 @@ msgstr "Ha sido invitado al siguiente evento.\n"
msgctxt "field:calendar.event,organizer_schedule_agent:"
msgid "Schedule Agent"
-msgstr "Agente de la Planificación"
+msgstr "Agente de la planificación"
msgctxt "field:calendar.event,organizer_schedule_status:"
msgid "Schedule Status"
-msgstr "Estado de la Planificación"
+msgstr "Estado de la planificación"
msgctxt "field:calendar.event.attendee,schedule_agent:"
msgid "Schedule Agent"
-msgstr "Agente de la Planificación"
+msgstr "Agente de la planificación"
msgctxt "field:calendar.event.attendee,schedule_status:"
msgid "Schedule Status"
-msgstr "Estado de la Planificación"
+msgstr "Estado de la planificación"
msgctxt "field:res.user,calendar_email_notification_cancel:"
msgid "Cancelled invitations"
@@ -112,7 +114,7 @@ msgstr "Nuevas invitaciones"
msgctxt "field:res.user,calendar_email_notification_partstat:"
msgid "Invitation Replies"
-msgstr "Respuestas a las Invitaciones"
+msgstr "Respuestas a las invitaciones"
msgctxt "field:res.user,calendar_email_notification_update:"
msgid "Changed invitations"
@@ -224,7 +226,7 @@ msgstr "5.3"
msgctxt "view:res.user:"
msgid "Calendar Email Notifications"
-msgstr "Notificaciones por Correo Electrónico del Calendario"
+msgstr "Notificaciones por correo electrónico del calendario"
msgctxt "view:res.user:"
msgid "Notifications"
diff --git a/res.py b/res.py
index 7ce879f..65327f7 100644
--- a/res.py
+++ b/res.py
@@ -1,5 +1,5 @@
-#This file is part of Tryton. The COPYRIGHT file at the top level of
-#this repository contains the full copyright notices and license terms.
+# This file is part of Tryton. The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
from trytond.model import fields
from trytond.pool import PoolMeta
diff --git a/setup.py b/setup.py
index dab81d2..522f471 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
-#This file is part of Tryton. The COPYRIGHT file at the top level of
-#this repository contains the full copyright notices and license terms.
+# This file is part of Tryton. The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
from setuptools import setup
import re
@@ -86,6 +86,8 @@ setup(name=name,
'Natural Language :: Spanish',
'Operating System :: OS Independent',
'Programming Language :: Python :: 2.7',
+ 'Programming Language :: Python :: Implementation :: CPython',
+ 'Programming Language :: Python :: Implementation :: PyPy',
'Topic :: Office/Business',
],
license='GPL-3',
diff --git a/tests/__init__.py b/tests/__init__.py
index 7cd8f75..7339898 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,5 +1,5 @@
-#This file is part of Tryton. The COPYRIGHT file at the top level of
-#this repository contains the full copyright notices and license terms.
+# This file is part of Tryton. The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
from .test_calendar_scheduling import suite
diff --git a/tests/scenario_calendar_scheduling.py b/tests/scenario_calendar_scheduling.py
index cbd6bea..9bf2be1 100644
--- a/tests/scenario_calendar_scheduling.py
+++ b/tests/scenario_calendar_scheduling.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
-#This file is part of Tryton. The COPYRIGHT file at the top level of
-#this repository contains the full copyright notices and license terms.
+# This file is part of Tryton. The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
from argparse import ArgumentParser
from urlparse import urlparse
import unittest
diff --git a/tests/test_calendar_scheduling.py b/tests/test_calendar_scheduling.py
index 642599e..74b11cc 100644
--- a/tests/test_calendar_scheduling.py
+++ b/tests/test_calendar_scheduling.py
@@ -1,23 +1,13 @@
-#This file is part of Tryton. The COPYRIGHT file at the top level of
-#this repository contains the full copyright notices and license terms.
+# This file is part of Tryton. The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
import unittest
import trytond.tests.test_tryton
-from trytond.tests.test_tryton import test_view, test_depends
+from trytond.tests.test_tryton import ModuleTestCase
-class CalendarSchedulingTestCase(unittest.TestCase):
+class CalendarSchedulingTestCase(ModuleTestCase):
'Test CalendarScheduling module'
-
- def setUp(self):
- trytond.tests.test_tryton.install_module('calendar_scheduling')
-
- def test0005views(self):
- 'Test views'
- test_view('calendar_scheduling')
-
- def test0006depends(self):
- 'Test depends'
- test_depends()
+ module = 'calendar_scheduling'
def suite():
diff --git a/tryton.cfg b/tryton.cfg
index 91a3e74..e7bd575 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.4.1
+version=3.6.0
depends:
calendar
ir
diff --git a/trytond_calendar_scheduling.egg-info/PKG-INFO b/trytond_calendar_scheduling.egg-info/PKG-INFO
index 929c8fb..34a7ad8 100644
--- a/trytond_calendar_scheduling.egg-info/PKG-INFO
+++ b/trytond_calendar_scheduling.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-calendar-scheduling
-Version: 3.4.1
+Version: 3.6.0
Summary: Tryton module to add scheduling support on CalDAV
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/3.4/
+Download-URL: http://downloads.tryton.org/3.6/
Description: trytond_calendar_scheduling
===========================
@@ -66,4 +66,6 @@ Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Programming Language :: Python :: Implementation :: PyPy
Classifier: Topic :: Office/Business
diff --git a/trytond_calendar_scheduling.egg-info/requires.txt b/trytond_calendar_scheduling.egg-info/requires.txt
index 5c9f7bc..e742346 100644
--- a/trytond_calendar_scheduling.egg-info/requires.txt
+++ b/trytond_calendar_scheduling.egg-info/requires.txt
@@ -1,6 +1,6 @@
PyWebDAV >= 0.9.8
-trytond_calendar >= 3.4, < 3.5
-trytond >= 3.4, < 3.5
+trytond_calendar >= 3.6, < 3.7
+trytond >= 3.6, < 3.7
[test]
caldav
\ No newline at end of file
--
tryton-modules-calendar-scheduling
More information about the tryton-debian-vcs
mailing list