Mercurial Mercurial > pub > hg > cubicweb / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cleanup
authorSylvain Thénault <sylvain.thenault@logilab.fr>
Mon, 25 Oct 2010 17:15:51 +0200
changeset 6632 78878f5a8166
parent 6631 26c303c3f1aa
child 6633 7baea108d326
cleanup
entities/schemaobjs.py file | annotate | diff | comparison | revisions
server/sources/pyrorql.py file | annotate | diff | comparison | revisions
server/test/unittest_migractions.py file | annotate | diff | comparison | revisions
server/test/unittest_rqlannotation.py file | annotate | diff | comparison | revisions
server/test/unittest_schemaserial.py file | annotate | diff | comparison | revisions
server/test/unittest_ssplanner.py file | annotate | diff | comparison | revisions
test/unittest_cwctl.py file | annotate | diff | comparison | revisions
web/views/idownloadable.py file | annotate | diff | comparison | revisions 
--- a/entities/schemaobjs.py	Mon Oct 25 17:15:46 2010 +0200
+++ b/entities/schemaobjs.py	Mon Oct 25 17:15:51 2010 +0200
@@ -68,7 +68,8 @@
         host = gethostname()
         for hostcfg in self.host_configs:
             if hostcfg.match(host):
-                self.info('matching host config %s' % hostcfg.match_host)
+                self.info('matching host config %s for source %s',
+                          hostcfg.match_host, self.name)
                 dictconfig.update(hostcfg.dictconfig)
         return dictconfig
 
--- a/server/sources/pyrorql.py	Mon Oct 25 17:15:46 2010 +0200
+++ b/server/sources/pyrorql.py	Mon Oct 25 17:15:51 2010 +0200
@@ -139,7 +139,7 @@
           'default': None,
           'help': 'Pyro name server\'s group where the repository will be \
 registered. If not set, default to the value from all_in_one.conf.',
-          'group': 'pyro-source', 'level': 1,
+          'group': 'pyro-source', 'level': 2,
           }),
         ('synchronization-interval',
          {'type' : 'int',
@@ -195,10 +195,10 @@
 
     def last_update_time(self):
         pkey = u'sources.%s.latest-update-time' % self.uri
-        rql = 'Any V WHERE X is CWProperty, X value V, X pkey %(k)s'
         session = self.repo.internal_session()
         try:
-            rset = session.execute(rql, {'k': pkey})
+            rset = session.execute('Any V WHERE X is CWProperty, X value V, X pkey %(k)s',
+                                   {'k': pkey})
             if not rset:
                 # insert it
                 session.execute('INSERT CWProperty X: X pkey %(k)s, X value %(v)s',
--- a/server/test/unittest_migractions.py	Mon Oct 25 17:15:46 2010 +0200
+++ b/server/test/unittest_migractions.py	Mon Oct 25 17:15:51 2010 +0200
@@ -416,7 +416,7 @@
                                            ('nom', 'prenom', 'datenaiss'))
         rset = cursor.execute('Any C WHERE C is CWUniqueTogetherConstraint')
         self.assertEqual(len(rset), 1)
-        relations = [r.rtype.name for r in rset.get_entity(0,0).relations]
+        relations = [r.rtype.name for r in rset.get_entity(0, 0).relations]
         self.assertItemsEqual(relations, ('nom', 'prenom', 'datenaiss'))
 
     def _erqlexpr_rset(self, action, ertype):
--- a/server/test/unittest_rqlannotation.py	Mon Oct 25 17:15:46 2010 +0200
+++ b/server/test/unittest_rqlannotation.py	Mon Oct 25 17:15:51 2010 +0200
@@ -16,8 +16,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License along
 # with CubicWeb.  If not, see <http://www.gnu.org/licenses/>.
-"""unit tests for modules cubicweb.server.rqlannotation
-"""
+"""unit tests for modules cubicweb.server.rqlannotation"""
 
 from cubicweb.devtools import init_test_database
 from cubicweb.devtools.repotest import BaseQuerierTC
--- a/server/test/unittest_schemaserial.py	Mon Oct 25 17:15:46 2010 +0200
+++ b/server/test/unittest_schemaserial.py	Mon Oct 25 17:15:51 2010 +0200
@@ -15,8 +15,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License along
 # with CubicWeb.  If not, see <http://www.gnu.org/licenses/>.
-"""unit tests for schema rql (de)serialization
-"""
+"""unit tests for schema rql (de)serialization"""
 
 import sys
 from cStringIO import StringIO
--- a/server/test/unittest_ssplanner.py	Mon Oct 25 17:15:46 2010 +0200
+++ b/server/test/unittest_ssplanner.py	Mon Oct 25 17:15:51 2010 +0200
@@ -15,9 +15,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License along
 # with CubicWeb.  If not, see <http://www.gnu.org/licenses/>.
-"""
 
-"""
 from cubicweb.devtools import init_test_database
 from cubicweb.devtools.repotest import BasePlannerTC, test_plan
 from cubicweb.server.ssplanner import SSPlanner
--- a/test/unittest_cwctl.py	Mon Oct 25 17:15:46 2010 +0200
+++ b/test/unittest_cwctl.py	Mon Oct 25 17:15:51 2010 +0200
@@ -15,9 +15,6 @@
 #
 # You should have received a copy of the GNU Lesser General Public License along
 # with CubicWeb.  If not, see <http://www.gnu.org/licenses/>.
-"""
-
-"""
 import sys
 import os
 from os.path import join
--- a/web/views/idownloadable.py	Mon Oct 25 17:15:46 2010 +0200
+++ b/web/views/idownloadable.py	Mon Oct 25 17:15:51 2010 +0200
@@ -31,6 +31,7 @@
 from cubicweb.web.views import primary, baseviews
 
 
+# XXX deprecated
 def download_box(w, entity, title=None, label=None, footer=u''):
     req = entity._cw
     w(u'<div class="sideBox">')
cubicweb