# HG changeset patch # User Sylvain Thénault # Date 1366807001 -7200 # Node ID 1eefbe171b5938599734266f90819d18ae43165a # Parent 57ffd0e0643d609e1690e9c1e8caf2ae651be839 [test] fix bad merge diff -r 57ffd0e0643d -r 1eefbe171b59 web/test/unittest_viewselector.py --- a/web/test/unittest_viewselector.py Tue Apr 16 13:44:01 2013 +0200 +++ b/web/test/unittest_viewselector.py Wed Apr 24 14:36:41 2013 +0200 @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# copyright 2003-2012 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +# copyright 2003-2013 LOGILAB S.A. (Paris, FRANCE), all rights reserved. # contact http://www.logilab.fr/ -- mailto:contact@logilab.fr # # This file is part of CubicWeb. @@ -47,11 +47,6 @@ cwsources.ManageSourcesAction, debug.SiteInfoAction] -if hasattr(rdf, 'RDFView') is not None: # not available if rdf lib not installed - RDFVIEWS = [('rdf', rdf.RDFView)] - -assert RDFVIEWS - if hasattr(rdf, 'RDFView'): # not available if rdflib not installed RDFVIEWS = [('rdf', rdf.RDFView)] else: