From 0f3d9169a5fe110b103b003cffed49ecec14f664 Mon Sep 17 00:00:00 2001 From: shubhangiKishore Date: Thu, 23 Mar 2017 14:23:22 +0530 Subject: [PATCH 1/4] Fixing test_db errors --- pattern/db/__init__.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pattern/db/__init__.py b/pattern/db/__init__.py index b65db990..d53a5d3a 100644 --- a/pattern/db/__init__.py +++ b/pattern/db/__init__.py @@ -25,6 +25,7 @@ from time import mktime, strftime from math import sqrt from types import GeneratorType +from functools import cmp_to_key try: # Python 2.x vs 3.x from cStringIO import StringIO @@ -528,7 +529,7 @@ def order(list, cmp=None, key=None, reverse=False): f = lambda i, j: int(key(list[i]) >= key(list[j])) * 2 - 1 else: f = lambda i, j: int(list[i] >= list[j]) * 2 - 1 - return sorted(range(len(list)), cmp=f, reverse=reverse) + return sorted(range(len(list)), key=cmp_to_key(f), reverse=reverse) _order = order @@ -2539,7 +2540,8 @@ def copy(self, rows=ALL, columns=ALL): if columns == ALL: return Datasheet(rows=(self.rows[i] for i in rows)) z = zip(*(self.columns[j] for j in columns)) - return Datasheet(rows=(z[i] for i in rows)) + z_list = list(z) + return Datasheet(rows=(z_list[i] for i in rows)) @property def array(self): From d1da813ae334401ad535525504e11e7a6385f35e Mon Sep 17 00:00:00 2001 From: shubhangiKishore Date: Thu, 23 Mar 2017 17:38:51 +0530 Subject: [PATCH 2/4] Fixing setuptools version --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 6fd77973..d9f59d47 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,7 @@ matrix: - python: "pypy" install: + - pip install --upgrade --pre setuptools - if [ "$TRAVIS_PYTHON_VERSION" == "2.6" ]; then pip install unittest2; fi - pip install future - python setup.py install --quiet From 8210932d81175c62d387459dde75af0eb36b2e06 Mon Sep 17 00:00:00 2001 From: shubhangiKishore Date: Thu, 23 Mar 2017 18:11:09 +0530 Subject: [PATCH 3/4] Dropping support for 2.6 trying --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d9f59d47..2664f3eb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,6 @@ language: python python: - - "2.6" - "2.7" - "pypy" - "3.3" From bfdd0011508552beee4e4dbfd6d44cfdeeb682c6 Mon Sep 17 00:00:00 2001 From: shubhangiKishore Date: Tue, 28 Mar 2017 23:04:58 +0530 Subject: [PATCH 4/4] Auto stash for cherrypick of "Fixing test_db errors" --- pattern/db/__init__.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pattern/db/__init__.py b/pattern/db/__init__.py index d53a5d3a..895eb738 100644 --- a/pattern/db/__init__.py +++ b/pattern/db/__init__.py @@ -1272,7 +1272,7 @@ def filter(self, *args, **kwargs): q = " and ".join(cmp(k, v, "=", self.db.escape) for k, v in kwargs.items()) q = q and " where %s" % q or "" - q = "select %s from `%s`%s;" % (fields, self.name, q) + q = "select %s from '%s'%s;" % (fields, self.name, q) return self.Rows(self, self.db.execute(q)) def find(self, *args, **kwargs): @@ -1307,9 +1307,9 @@ def insert(self, *args, **kwargs): zip((f for f in self.fields if f != self.pk), args[0])) if len(self.default) > 0: kwargs.update(self.default) - k = ", ".join("`%s`" % k for k in kwargs.keys()) - v = ", ".join(self.db.escape(v) for v in kwargs.values()) - q = "insert into `%s` (%s) values (%s);" % (self.name, k, v) + k = ", ".join("'%s'" % k for k in kwargs.keys()) + v = ", ".join("'%s'" % str(v) for v in kwargs.values()) + q = "insert into %s (%s) values (%s);" % (self.name, k, v) self.db.execute(q, commit) return self._insert_id()