[Python-modules-commits] [python-tornado] 04/05: merge patched into master

[Gianfranco Costamagna]

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

locutusofborg pushed a commit to branch master
in repository python-tornado.

commit d848d6974ef8bf2cf053a56ba0c5d597dfa53f2f
Merge: d8eaae0 665ea0e
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Tue May 24 12:59:28 2016 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 ...ysql-as-a-drop-in-replacement-for-MySQLdb.patch | 23 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 demos/blog/blog.py                                 |  3 +++
 4 files changed, 29 insertions(+), 2 deletions(-)

diff --cc debian/.git-dpm
index c129e9a,0000000..7b756eb
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- df1105b186eccf103277d0ccddd4c88e9f9d3c08
- df1105b186eccf103277d0ccddd4c88e9f9d3c08
++665ea0e820a18f441329cdcf9f104278c32ffd99
++665ea0e820a18f441329cdcf9f104278c32ffd99
 +b10d25d01667a1069e6607ceb8ec948e27e3063c
 +b10d25d01667a1069e6607ceb8ec948e27e3063c
 +python-tornado_4.3.0.orig.tar.gz
 +b488ab5baa09167699d2baa8e443d0aa07a57c99
 +475749
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0008-Use-pymysql-as-a-drop-in-replacement-for-MySQLdb.patch
index 0000000,0000000..a892e52
new file mode 100644
--- /dev/null
+++ b/debian/patches/0008-Use-pymysql-as-a-drop-in-replacement-for-MySQLdb.patch
@@@ -1,0 -1,0 +1,23 @@@
++From 665ea0e820a18f441329cdcf9f104278c32ffd99 Mon Sep 17 00:00:00 2001
++From: Corey Bryant <corey.bryant at canonical.com>
++Date: Tue, 24 May 2016 12:58:59 +0200
++Subject: Use pymysql as a drop-in replacement for MySQLdb.
++
++---
++ demos/blog/blog.py | 3 +++
++ 1 file changed, 3 insertions(+)
++
++diff --git a/demos/blog/blog.py b/demos/blog/blog.py
++index c78e532..14dd699 100755
++--- a/demos/blog/blog.py
+++++ b/demos/blog/blog.py
++@@ -14,6 +14,9 @@
++ # License for the specific language governing permissions and limitations
++ # under the License.
++ 
+++import pymysql
+++pymysql.install_as_MySQLdb()
+++
++ import bcrypt
++ import concurrent.futures
++ import MySQLdb
diff --cc debian/patches/series
index d5dbd2e,0000000..5e65080
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,7 -1,0 +1,8 @@@
 +domain-test.patch
 +ignoreuserwarning.patch
 +skip-timing-tests.patch
 +sockopt.patch
 +without-certifi.patch
 +fix-ftbfs-on-hurd.patch
 +0007-Fix-testsuite-failure-when-sockets-is-not-defined.patch
++0008-Use-pymysql-as-a-drop-in-replacement-for-MySQLdb.patch

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