[tryton-debian-vcs] tryton-modules-party-vcarddav branch upstream updated. upstream/3.8.0-1-g8e4dde4
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Jun 2 16:01:45 UTC 2016
The following commit has been merged in the upstream branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-party-vcarddav.git;a=commitdiff;h=upstream/3.8.0-1-g8e4dde4
commit 8e4dde4e183afceb3db2785a66b25e20c2a82449
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri May 27 18:26:07 2016 +0200
Adding upstream version 4.0.0.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index 0ed13ae..4879165 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.0.0 - 2016-05-02
+* Bug fixes (see mercurial logs for details)
+
Version 3.8.0 - 2015-11-02
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 87683b8..163ea53 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2009-2015 Cédric Krier.
+Copyright (C) 2009-2016 Cédric Krier.
Copyright (C) 2009-2013 Bertrand Chenal.
-Copyright (C) 2009-2015 B2CK SPRL.
+Copyright (C) 2009-2016 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/INSTALL b/INSTALL
index 20a7448..867959c 100644
--- a/INSTALL
+++ b/INSTALL
@@ -7,6 +7,7 @@ Prerequisites
* Python 2.7 or later (http://www.python.org/)
* trytond (http://www.tryton.org/)
* trytond_party (http://www.tryton.org/)
+ * trytond_webdav (http://www.tryton.org/)
* vobject 0.8.0 or later (http://vobject.skyhouseconsulting.com/)
* pywebdav 0.9.8 or later (http://sourceforge.net/projects/pywebdav/)
* python-sql (http://code.google.com/p/python-sql/)
diff --git a/PKG-INFO b/PKG-INFO
index 9344f37..1ccac2f 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_party_vcarddav
-Version: 3.8.0
+Version: 4.0.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.8/
+Download-URL: http://downloads.tryton.org/4.0/
Description: trytond_party_vcarddav
======================
@@ -56,6 +56,7 @@ Classifier: Intended Audience :: Manufacturing
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
Classifier: Natural Language :: Bulgarian
Classifier: Natural Language :: Catalan
+Classifier: Natural Language :: Chinese (Simplified)
Classifier: Natural Language :: Czech
Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
diff --git a/carddav.py b/carddav.py
index 2f05e05..73790ef 100644
--- a/carddav.py
+++ b/carddav.py
@@ -2,7 +2,7 @@
# 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
+from trytond.modules.webdav.protocol import TrytonDAVInterface, LOCAL
from trytond.pool import Pool
from trytond.transaction import Transaction
@@ -36,13 +36,13 @@ def _get_carddav_address_data(self, uri):
dbname, dburi = self._get_dburi(uri)
if not dbname:
raise DAV_NotFound
- pool = Pool(Transaction().cursor.database_name)
+ pool = Pool(Transaction().database.name)
try:
Collection = pool.get('webdav.collection')
except KeyError:
raise DAV_NotFound
try:
- return Collection.get_address_data(dburi, cache=CACHE)
+ return Collection.get_address_data(dburi, cache=LOCAL.cache)
except DAV_Error:
raise
except Exception:
diff --git a/locale/es_EC.po b/locale/es_EC.po
index 7e41214..e77f395 100644
--- a/locale/es_EC.po
+++ b/locale/es_EC.po
@@ -12,7 +12,7 @@ msgstr "UUID"
msgctxt "field:party.party,vcard:"
msgid "VCard"
-msgstr "VCard"
+msgstr "vCard"
msgctxt "help:party.party,uuid:"
msgid "Universally Unique Identifier"
@@ -20,4 +20,4 @@ msgstr "Identificador Universal Único"
msgctxt "model:ir.action,name:report_party_vcard"
msgid "VCard"
-msgstr "VCard"
+msgstr "vCard"
diff --git a/locale/es_EC.po b/locale/lo_LA.po
similarity index 74%
copy from locale/es_EC.po
copy to locale/lo_LA.po
index 7e41214..de94f2b 100644
--- a/locale/es_EC.po
+++ b/locale/lo_LA.po
@@ -4,20 +4,20 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:party.party:"
msgid "The UUID of the party must be unique."
-msgstr "El UUID del tercero debe ser único."
+msgstr ""
msgctxt "field:party.party,uuid:"
msgid "UUID"
-msgstr "UUID"
+msgstr ""
msgctxt "field:party.party,vcard:"
msgid "VCard"
-msgstr "VCard"
+msgstr ""
msgctxt "help:party.party,uuid:"
msgid "Universally Unique Identifier"
-msgstr "Identificador Universal Único"
+msgstr ""
msgctxt "model:ir.action,name:report_party_vcard"
msgid "VCard"
-msgstr "VCard"
+msgstr ""
diff --git a/locale/es_EC.po b/locale/zh_CN.po
similarity index 74%
copy from locale/es_EC.po
copy to locale/zh_CN.po
index 7e41214..de94f2b 100644
--- a/locale/es_EC.po
+++ b/locale/zh_CN.po
@@ -4,20 +4,20 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:party.party:"
msgid "The UUID of the party must be unique."
-msgstr "El UUID del tercero debe ser único."
+msgstr ""
msgctxt "field:party.party,uuid:"
msgid "UUID"
-msgstr "UUID"
+msgstr ""
msgctxt "field:party.party,vcard:"
msgid "VCard"
-msgstr "VCard"
+msgstr ""
msgctxt "help:party.party,uuid:"
msgid "Universally Unique Identifier"
-msgstr "Identificador Universal Único"
+msgstr ""
msgctxt "model:ir.action,name:report_party_vcard"
msgid "VCard"
-msgstr "VCard"
+msgstr ""
diff --git a/party.py b/party.py
index 5ba9d96..abf19c9 100644
--- a/party.py
+++ b/party.py
@@ -31,8 +31,8 @@ class Party:
@classmethod
def __register__(cls, module_name):
TableHandler = backend.get('TableHandler')
- cursor = Transaction().cursor
- table = TableHandler(cursor, cls, module_name)
+ cursor = Transaction().connection.cursor()
+ table = TableHandler(cls, module_name)
sql_table = cls.__table__()
if not table.column_exist('uuid'):
diff --git a/setup.py b/setup.py
index 840b21f..994c50c 100644
--- a/setup.py
+++ b/setup.py
@@ -43,7 +43,7 @@ if minor_version % 2:
requires = ['vobject >= 0.8.0', 'PyWebDAV >= 0.9.8', 'python-sql']
for dep in info.get('depends', []):
- if not re.match(r'(ir|res|webdav)(\W|$)', dep):
+ if not re.match(r'(ir|res)(\W|$)', dep):
requires.append(get_require_version('trytond_%s' % dep))
requires.append(get_require_version('trytond'))
@@ -75,6 +75,7 @@ setup(name=name,
'License :: OSI Approved :: GNU General Public License (GPL)',
'Natural Language :: Bulgarian',
'Natural Language :: Catalan',
+ 'Natural Language :: Chinese (Simplified)',
'Natural Language :: Czech',
'Natural Language :: Dutch',
'Natural Language :: English',
diff --git a/tryton.cfg b/tryton.cfg
index 9682c43..13551f1 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.8.0
+version=4.0.0
depends:
ir
party
diff --git a/trytond_party_vcarddav.egg-info/PKG-INFO b/trytond_party_vcarddav.egg-info/PKG-INFO
index abafa72..deaa430 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.8.0
+Version: 4.0.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.8/
+Download-URL: http://downloads.tryton.org/4.0/
Description: trytond_party_vcarddav
======================
@@ -56,6 +56,7 @@ Classifier: Intended Audience :: Manufacturing
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
Classifier: Natural Language :: Bulgarian
Classifier: Natural Language :: Catalan
+Classifier: Natural Language :: Chinese (Simplified)
Classifier: Natural Language :: Czech
Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
diff --git a/trytond_party_vcarddav.egg-info/SOURCES.txt b/trytond_party_vcarddav.egg-info/SOURCES.txt
index db430e2..77c5d62 100644
--- a/trytond_party_vcarddav.egg-info/SOURCES.txt
+++ b/trytond_party_vcarddav.egg-info/SOURCES.txt
@@ -45,11 +45,13 @@ locale/fr_FR.po
locale/hu_HU.po
locale/it_IT.po
locale/ja_JP.po
+locale/lo_LA.po
locale/lt_LT.po
locale/nl_NL.po
locale/pt_BR.po
locale/ru_RU.po
locale/sl_SI.po
+locale/zh_CN.po
trytond_party_vcarddav.egg-info/PKG-INFO
trytond_party_vcarddav.egg-info/SOURCES.txt
trytond_party_vcarddav.egg-info/dependency_links.txt
diff --git a/trytond_party_vcarddav.egg-info/requires.txt b/trytond_party_vcarddav.egg-info/requires.txt
index 760706a..741517d 100644
--- a/trytond_party_vcarddav.egg-info/requires.txt
+++ b/trytond_party_vcarddav.egg-info/requires.txt
@@ -1,5 +1,6 @@
vobject >= 0.8.0
PyWebDAV >= 0.9.8
python-sql
-trytond_party >= 3.8, < 3.9
-trytond >= 3.8, < 3.9
\ No newline at end of file
+trytond_party >= 4.0, < 4.1
+trytond_webdav >= 4.0, < 4.1
+trytond >= 4.0, < 4.1
\ No newline at end of file
diff --git a/webdav.py b/webdav.py
index 69c72a7..912e69f 100644
--- a/webdav.py
+++ b/webdav.py
@@ -177,7 +177,7 @@ class Collection:
party = Party.__table__()
party_id = cls.vcard(uri)
- cursor = Transaction().cursor
+ cursor = Transaction().connection.cursor()
if party_id is None:
raise DAV_NotFound
@@ -217,7 +217,7 @@ class Collection:
address = Address.__table__()
contact_mechanism = ContactMechanism.__table__()
- cursor = Transaction().cursor
+ cursor = Transaction().connection.cursor()
party_id = cls.vcard(uri)
if party_id:
@@ -294,7 +294,7 @@ class Collection:
except Exception:
raise DAV_Forbidden
party = Party(party_id)
- return (Transaction().cursor.database_name + '/Contacts/' +
+ return (Transaction().database.name + '/Contacts/' +
party.uuid + '.vcf')
if party_id:
party = Party(party_id)
--
tryton-modules-party-vcarddav
More information about the tryton-debian-vcs
mailing list