[tryton-debian-vcs] tryton-modules-party-vcarddav branch debian updated. debian/3.4.1-1-2-g5c163bc
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Apr 23 16:04:28 UTC 2015
The following commit has been merged in the debian branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-party-vcarddav.git;a=commitdiff;h=debian/3.4.1-1-2-g5c163bc
commit 5c163bc446baafb48f573c13236ca8ff548ce0cb
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Apr 23 17:00:00 2015 +0200
Merging upstream version 3.6.0.
diff --git a/CHANGELOG b/CHANGELOG
index f712fa9..f7c8797 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,6 @@
-Version 3.4.1 - 2015-02-22
+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 2cbb2d0..3789759 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_party_vcarddav
-Version: 3.4.1
+Version: 3.6.0
Summary: Tryton module for CardDAV
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_party_vcarddav
======================
@@ -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 ee29b01..597d067 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 carddav
diff --git a/carddav.py b/carddav.py
index 58b8b0d..2f05e05 100644
--- a/carddav.py
+++ b/carddav.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 import propfind
from pywebdav.lib.errors import DAV_NotFound, DAV_Error
from trytond.protocols.webdav import TrytonDAVInterface, CACHE
@@ -7,8 +7,8 @@ from trytond.pool import Pool
from trytond.transaction import Transaction
TrytonDAVInterface.PROPS['urn:ietf:params:xml:ns:carddav'] = (
- 'address-data',
- 'addressbook-data',
+ 'address-data',
+ 'addressbook-data',
)
TrytonDAVInterface.M_NS['urn:ietf:params:xml:ns:carddav'] = '_get_carddav'
diff --git a/party.py b/party.py
index eba6219..788d754 100644
--- a/party.py
+++ b/party.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.
import uuid
import vobject
@@ -280,24 +280,13 @@ class VCard(Report):
__name__ = 'party_vcarddav.party.vcard'
@classmethod
- def execute(cls, ids, data):
- pool = Pool()
- Party = pool.get('party.party')
- ActionReport = pool.get('ir.action.report')
-
- action_reports = ActionReport.search([
- ('report_name', '=', cls.__name__)
- ])
- if not action_reports:
- raise Exception('Error', 'Report (%s) not find!' % cls.__name__)
- action_report = action_reports[0]
-
- parties = Party.browse(ids)
+ def render(cls, report, report_context):
+ return ''.join(cls.create_vcard(party).serialize()
+ for party in report_context['records'])
- data = ''.join(cls.create_vcard(party).serialize()
- for party in parties)
-
- return ('vcf', buffer(data), False, action_report.name)
+ @classmethod
+ def convert(cls, report, data):
+ return 'vcf', data
@classmethod
def create_vcard(cls, party):
diff --git a/setup.py b/setup.py
index a681d20..9b7eb4f 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
@@ -85,6 +85,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/tryton.cfg b/tryton.cfg
index 6d08a33..1f40de5 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.4.1
+version=3.6.0
depends:
ir
party
diff --git a/trytond_party_vcarddav.egg-info/PKG-INFO b/trytond_party_vcarddav.egg-info/PKG-INFO
index dba5316..327cdc3 100644
--- a/trytond_party_vcarddav.egg-info/PKG-INFO
+++ b/trytond_party_vcarddav.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-party-vcarddav
-Version: 3.4.1
+Version: 3.6.0
Summary: Tryton module for CardDAV
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_party_vcarddav
======================
@@ -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_party_vcarddav.egg-info/requires.txt b/trytond_party_vcarddav.egg-info/requires.txt
index c2f61fb..6ffd040 100644
--- a/trytond_party_vcarddav.egg-info/requires.txt
+++ b/trytond_party_vcarddav.egg-info/requires.txt
@@ -1,5 +1,5 @@
vobject >= 0.8.0
PyWebDAV >= 0.9.8
python-sql
-trytond_party >= 3.4, < 3.5
-trytond >= 3.4, < 3.5
\ No newline at end of file
+trytond_party >= 3.6, < 3.7
+trytond >= 3.6, < 3.7
\ No newline at end of file
diff --git a/webdav.py b/webdav.py
index bb94d2d..69c72a7 100644
--- a/webdav.py
+++ b/webdav.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.errors import DAV_NotFound, DAV_Forbidden
from pywebdav.lib.constants import COLLECTION, OBJECT
from sql.functions import Extract
--
tryton-modules-party-vcarddav
More information about the tryton-debian-vcs
mailing list