# HG changeset patch
# User Sylvain Thénault <sylvain.thenault@logilab.fr>
# Date 1347637344 -7200
# Node ID eb7a171cec72b56c235edeb2f18227bb9399c114
# Parent  d764a2331a81d2aca390e24fc2870e2c2df9e391
[repo pyro] fix previous commit: should not import Pyro in remoterql module/base class, it may be missing

diff -r d764a2331a81 -r eb7a171cec72 server/sources/pyrorql.py
--- a/server/sources/pyrorql.py	Mon Sep 03 12:26:20 2012 +0200
+++ b/server/sources/pyrorql.py	Fri Sep 14 17:42:24 2012 +0200
@@ -91,5 +91,9 @@
         except AttributeError:
             # inmemory connection
             pass
-        return super(PyroRQLSource, self).check_connection(cnx)
+        try:
+            return super(PyroRQLSource, self).check_connection(cnx)
+        except ConnectionClosedError:
+            # try to reconnect
+            return self.get_connection()
 
diff -r d764a2331a81 -r eb7a171cec72 server/sources/remoterql.py
--- a/server/sources/remoterql.py	Mon Sep 03 12:26:20 2012 +0200
+++ b/server/sources/remoterql.py	Fri Sep 14 17:42:24 2012 +0200
@@ -30,8 +30,6 @@
 from rql.nodes import Constant
 from rql.utils import rqlvar_maker
 
-from Pyro.errors import ConnectionClosedError
-
 from cubicweb import dbapi, server
 from cubicweb import ValidationError, BadConnectionId, UnknownEid
 from cubicweb.schema import VIRTUAL_RTYPES
@@ -304,7 +302,7 @@
             try:
                 cnx.check()
                 return # ok
-            except (BadConnectionId, ConnectionClosedError):
+            except BadConnectionId:
                 pass
         # try to reconnect
         return self.get_connection()