[Python-modules-commits] [mysql-connector-python] 01/09: remove, merged upstream

[Sandro Tosi]

This is an automated email from the git hooks/post-receive script.

morph pushed a commit to branch master
in repository mysql-connector-python.

commit 2898da05d146bff40682a7e76ab5038cf75f8303
Author: Sandro Tosi <morph at debian.org>
Date:   Fri Jun 17 20:21:42 2016 +0100

    remove, merged upstream
---
 debian/changelog                             |  7 ++++++-
 debian/patches/fix_last_executed_query.patch | 24 ------------------------
 debian/patches/series                        |  1 -
 3 files changed, 6 insertions(+), 26 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2aeed83..5f3b66f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
 mysql-connector-python (2.0.4-2) UNRELEASED; urgency=medium
 
+  [ Sandro Tosi ]
+  * debian/patches/
+    - remove, merged upstream
+
+  [ Ondřej Nový ]
   * Fixed VCS URL (https)
 
- -- Ondřej Nový <novy at ondrej.org>  Tue, 29 Mar 2016 21:44:16 +0200
+ -- Sandro Tosi <morph at debian.org>  Fri, 17 Jun 2016 20:21:18 +0100
 
 mysql-connector-python (2.0.4-1) unstable; urgency=medium
 
diff --git a/debian/patches/fix_last_executed_query.patch b/debian/patches/fix_last_executed_query.patch
deleted file mode 100644
index 22c3590..0000000
--- a/debian/patches/fix_last_executed_query.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From b205ef5314fee6d15e4ae2d58d65b2bd4e765f4d Mon Sep 17 00:00:00 2001
-From: SVN-Git Migration <python-modules-team at lists.alioth.debian.org>
-Date: Thu, 8 Oct 2015 09:58:12 -0700
-Subject: fix_last_executed_query
-
-Patch-Name: fix_last_executed_query.patch
----
- lib/mysql/connector/django/base.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/lib/mysql/connector/django/base.py b/lib/mysql/connector/django/base.py
-index 3791f6e..28689fd 100644
---- a/lib/mysql/connector/django/base.py
-+++ b/lib/mysql/connector/django/base.py
-@@ -374,7 +374,8 @@ class DatabaseOperations(BaseDatabaseOperations):
-         return 'MATCH ({0}) AGAINST (%s IN BOOLEAN MODE)'.format(field_name)
- 
-     def last_executed_query(self, cursor, sql, params):
--        return cursor.statement
-+        from django.utils.encoding import force_text
-+        return force_text(cursor.statement)
- 
-     def no_limit_value(self):
-         # 2**64 - 1, as recommended by the MySQL documentation
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 794350f..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-fix_last_executed_query.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/mysql-connector-python.git