[tryton-debian-vcs] tryton-modules-party-vcarddav branch upstream-2.6 created. 8cac9a28dd1e8b3090c0915e30168867e3f82e4f

[Mathias Behrle]

The following commit has been merged in the upstream-2.6 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-party-vcarddav.git;a=commitdiff;h=8cac9a28dd1e8b3090c0915e30168867e3f82e4f
commit 8cac9a28dd1e8b3090c0915e30168867e3f82e4f
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sat May 4 01:57:00 2013 +0200

    Adding upstream version 2.6.1.

diff --git a/CHANGELOG b/CHANGELOG
index 2a0dd2b..5601772 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.1 - 2013-05-02
+* Bug fixes (see mercurial logs for details)
+
 Version 2.6.0 - 2012-10-22
 * Bug fixes (see mercurial logs for details)
 
diff --git a/COPYRIGHT b/COPYRIGHT
index 8ad4b79..39f9196 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2009-2012 Cédric Krier.
+Copyright (C) 2009-2013 Cédric Krier.
 Copyright (C) 2009-2012 Bertrand Chenal.
-Copyright (C) 2009-2012 B2CK SPRL.
+Copyright (C) 2009-2013 B2CK SPRL.
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/PKG-INFO b/PKG-INFO
index 728f9a4..843c499 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
 Name: trytond_party_vcarddav
-Version: 2.6.0
+Version: 2.6.1
 Summary: Tryton module for CardDAV
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/party.py b/party.py
index 94aac3d..8668d6a 100644
--- a/party.py
+++ b/party.py
@@ -271,7 +271,7 @@ class VCard(Report):
             raise Exception('Error', 'Report (%s) not find!' % cls.__name__)
         action_report = action_reports[0]
 
-        parties = Party(ids)
+        parties = Party.browse(ids)
 
         data = ''.join(cls.create_vcard(party).serialize()
             for party in parties)
diff --git a/tryton.cfg b/tryton.cfg
index e9fe934..cc3992b 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=2.6.0
+version=2.6.1
 depends:
     ir
     party
diff --git a/trytond_party_vcarddav.egg-info/PKG-INFO b/trytond_party_vcarddav.egg-info/PKG-INFO
index 4ec2583..d4fde30 100644
--- a/trytond_party_vcarddav.egg-info/PKG-INFO
+++ b/trytond_party_vcarddav.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
 Name: trytond-party-vcarddav
-Version: 2.6.0
+Version: 2.6.1
 Summary: Tryton module for CardDAV
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/webdav.py b/webdav.py
index ee65adf..4dadbae 100644
--- a/webdav.py
+++ b/webdav.py
@@ -1,6 +1,7 @@
 #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 trytond.tools import reduce_ids
 from trytond.transaction import Transaction
 from trytond.cache import Cache
@@ -153,7 +154,6 @@ class Collection:
 
     @classmethod
     def get_resourcetype(cls, uri, cache=None):
-        from DAV.constants import COLLECTION, OBJECT
         party_id = cls.vcard(uri)
         if party_id:
             return OBJECT
@@ -262,7 +262,7 @@ class Collection:
         if party_id:
             val = Vcard.execute([party_id],
                 {'id': party_id, 'ids': [party_id]})
-            return val[1]
+            return str(val[1])
         return super(Collection, cls).get_data(uri, cache=cache)
 
     @classmethod
-- 
tryton-modules-party-vcarddav