[tryton-debian-vcs] tryton-proteus branch upstream updated. upstream/3.4.1-1-gcfc7663

[Mathias Behrle]

The following commit has been merged in the upstream branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-proteus.git;a=commitdiff;h=upstream/3.4.1-1-gcfc7663

commit cfc7663064936536710c640769f30724ba70f62c
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Feb 18 10:40:05 2015 +0100

    Adding upstream version 3.4.2.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/CHANGELOG b/CHANGELOG
index 81f538e..259efaf 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.4.2 - 2015-02-16
+* Bug fixes (see mercurial logs for details)
+
 Version 3.4.1 - 2014-12-03
 * Bug fixes (see mercurial logs for details)
 
diff --git a/COPYRIGHT b/COPYRIGHT
index c655746..ff16b62 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
-Copyright (C) 2010-2014 Cédric Krier.
-Copyright (C) 2010-2014 B2CK SPRL.
+Copyright (C) 2010-2015 Cédric Krier.
+Copyright (C) 2010-2015 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 24b4424..18ecd40 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: proteus
-Version: 3.4.1
+Version: 3.4.2
 Summary: Library to access Tryton server as a client
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/proteus.egg-info/PKG-INFO b/proteus.egg-info/PKG-INFO
index 24b4424..18ecd40 100644
--- a/proteus.egg-info/PKG-INFO
+++ b/proteus.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: proteus
-Version: 3.4.1
+Version: 3.4.2
 Summary: Library to access Tryton server as a client
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/proteus/__init__.py b/proteus/__init__.py
index d065068..59ef22d 100644
--- a/proteus/__init__.py
+++ b/proteus/__init__.py
@@ -3,7 +3,7 @@
 '''
 A library to access Tryton's models like a client.
 '''
-__version__ = "3.4.1"
+__version__ = "3.4.2"
 __all__ = ['Model', 'Wizard', 'Report']
 import sys
 try:
diff --git a/proteus/config.py b/proteus/config.py
index c01e451..3aeeb35 100644
--- a/proteus/config.py
+++ b/proteus/config.py
@@ -231,9 +231,9 @@ class TrytondConfig(Config):
     __init__.__doc__ = object.__init__.__doc__
 
     def __repr__(self):
-        return "proteus.config.TrytondConfig"\
-            "('%s', '%s', '%s', config_file=%s)"\
-            % (self.database, self._user, self.config_file)
+        return ("proteus.config.TrytondConfig"
+            "(%s, %s, config_file=%s)"
+            % (repr(self.database), repr(self._user), repr(self.config_file)))
     __repr__.__doc__ = object.__repr__.__doc__
 
     def __eq__(self, other):
@@ -296,7 +296,7 @@ class XmlrpcConfig(Config):
     __init__.__doc__ = object.__init__.__doc__
 
     def __repr__(self):
-        return "proteus.config.XmlrpcConfig('%s')" % self.url
+        return "proteus.config.XmlrpcConfig(%s)" % repr(self.url)
     __repr__.__doc__ = object.__repr__.__doc__
 
     def __eq__(self, other):
diff --git a/proteus/tests/test_report.py b/proteus/tests/test_report.py
index d11c7bc..a04f643 100644
--- a/proteus/tests/test_report.py
+++ b/proteus/tests/test_report.py
@@ -1,12 +1,18 @@
 #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 unittest import TestCase
-from proteus import config, Report, Model
+import unittest
+try:
+    import pydot
+except ImportError:
+    pydot = None
+
+from proteus import Report, Model
 from .common import ProteusTestCase
 
 
 class TestReport(ProteusTestCase):
 
+    @unittest.skipIf(not pydot, 'requires pydot')
     def test_model_graph(self):
         IrModel = Model.get('ir.model')
         models = IrModel.find([])
diff --git a/setup.py b/setup.py
index 4f6c48c..e551c36 100644
--- a/setup.py
+++ b/setup.py
@@ -32,6 +32,10 @@ if minor_version % 2:
     download_url = 'hg+http://hg.tryton.org/%s#egg=%s-%s' % (
         name, name, version)
 
+dependency_links = []
+if minor_version % 2:
+    # Add development index for testing with trytond
+    dependency_links.append('https://trydevpi.tryton.org/')
 
 setup(name=name,
     version=version,
@@ -66,6 +70,7 @@ setup(name=name,
         'simplejson': ['simplejson'],
         'cdecimal': ['cdecimal'],
         },
+    dependency_links=dependency_links,
     zip_safe=True,
     test_suite='proteus.tests',
     tests_require=[get_require_version('trytond')],
-- 
tryton-proteus