# HG changeset patch
# User Arthur Lutz <arthur.lutz@logilab.fr>
# Date 1228242359 -3600
# Node ID bed4bc2e0a2fffdb411e57a29a8aca0f0ea089c5
# Parent  c7d6a465b951f02564c49994ffd800eab5f80142# Parent  455ff18ef28e27493658dc54068117a292a4374b
merge

diff -r c7d6a465b951 -r bed4bc2e0a2f rset.py
--- a/rset.py	Tue Dec 02 19:25:38 2008 +0100
+++ b/rset.py	Tue Dec 02 19:25:59 2008 +0100
@@ -59,10 +59,10 @@
     
     def __repr__(self):
         if not self.rows:
-            return '<empty resultset for %s>' % self.rql
+            return '<empty resultset for %r>' % self.rql
         if not self.description:
-            return '<resultset %s: %s>' % (self.rql, '\n'.join(str(r) for r in self.rows))
-        return '<resultset %s: %s>' % (self.rql,
+            return '<resultset %r: %s>' % (self.rql, '\n'.join(str(r) for r in self.rows))
+        return '<resultset %r: %s>' % (self.rql,
                                        '\n'.join('%s (%s)' % (r, d)
                                                  for r, d in zip(self.rows, self.description)))
 
diff -r c7d6a465b951 -r bed4bc2e0a2f skeleton/__pkginfo__.py.tmpl
--- a/skeleton/__pkginfo__.py.tmpl	Tue Dec 02 19:25:38 2008 +0100
+++ b/skeleton/__pkginfo__.py.tmpl	Tue Dec 02 19:25:59 2008 +0100
@@ -32,7 +32,7 @@
             if fname[0] != '.' and not fname.endswith('.pyc')
             and not fname.endswith('~')]
 
-
+from glob import glob
 try:
     data_files = [
         # common files