merge stable
authorNicolas Chauvat <nicolas.chauvat@logilab.fr>
Mon, 25 May 2009 16:03:32 +0200
branchstable
changeset 1921 fdb50aa7e5b3
parent 1920 31843b49188d (diff)
parent 1919 983dfd00df21 (current diff)
child 1922 1a0ddb675951
child 1924 dc903af1a34e
merge
--- a/debian/cubicweb-common.install.in	Mon May 25 00:34:49 2009 +0200
+++ b/debian/cubicweb-common.install.in	Mon May 25 16:03:32 2009 +0200
@@ -2,4 +2,4 @@
 debian/tmp/usr/lib/PY_VERSION/site-packages/cubicweb/entities/ usr/lib/PY_VERSION/site-packages/cubicweb
 debian/tmp/usr/lib/PY_VERSION/site-packages/cubicweb/ext/ usr/lib/PY_VERSION/site-packages/cubicweb
 debian/tmp/usr/share/cubicweb/cubes/shared/i18n usr/share/cubicweb/cubes/shared/
-debian/tmp/usr/lib/PY_VERSION/site-packages/cubicweb/*.py usr/share/pyshared/cubicweb
+debian/tmp/usr/lib/PY_VERSION/site-packages/cubicweb/*.py usr/share/python-support/cubicweb
--- a/server/schemaserial.py	Mon May 25 00:34:49 2009 +0200
+++ b/server/schemaserial.py	Mon May 25 16:03:32 2009 +0200
@@ -51,7 +51,7 @@
 def _set_sql_prefix(prefix):
     """3.2.0 migration function: allow to unset/reset SQL_PREFIX"""
     for module in ('checkintegrity', 'migractions', 'schemahooks',
-                   'sources.rql2sql', 'sources.native'):
+                   'sources.rql2sql', 'sources.native', 'sqlutils'):
         try:
             sys.modules['cubicweb.server.%s' % module].SQL_PREFIX = prefix
             print 'changed SQL_PREFIX for %s' % module
--- a/skeleton/__pkginfo__.py.tmpl	Mon May 25 00:34:49 2009 +0200
+++ b/skeleton/__pkginfo__.py.tmpl	Mon May 25 16:03:32 2009 +0200
@@ -32,7 +32,7 @@
     return [join(dirpath, fname) for fname in _listdir(dirpath)
             if fname[0] != '.' and not fname.endswith('.pyc')
             and not fname.endswith('~')
-            and not isdir(join(dirpath, fname))]ΒΆ
+            and not isdir(join(dirpath, fname))]
 
 from glob import glob
 try:
--- a/web/test/unittest_viewselector.py	Mon May 25 00:34:49 2009 +0200
+++ b/web/test/unittest_viewselector.py	Mon May 25 16:03:32 2009 +0200
@@ -1,8 +1,6 @@
 # -*- coding: iso-8859-1 -*-
 """XXX rename, split, reorganize this
 """
-from __future__ import with_statement
-
 from logilab.common.testlib import unittest_main
 
 from cubicweb.devtools.apptest import EnvBasedTC