[Python-modules-commits] [python-tornado] 02/03: 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 527c2139281830f2e48bfc38f4679d1ecb064c66
Merge: 752dfcc 5e63252
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Tue May 24 15:06:30 2016 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 ...pymysql-as-a-drop-in-replacement-for-MySQ.patch | 24 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 demos/blog/blog.py                                 |  3 ---
 4 files changed, 27 insertions(+), 5 deletions(-)

diff --cc debian/.git-dpm
index 7b756eb,0000000..9040b23
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
- 665ea0e820a18f441329cdcf9f104278c32ffd99
- 665ea0e820a18f441329cdcf9f104278c32ffd99
++5e63252dd39776080eb2604958f0a735c1dbcc06
++5e63252dd39776080eb2604958f0a735c1dbcc06
 +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/0009-Revert-Use-pymysql-as-a-drop-in-replacement-for-MySQ.patch
index 0000000,0000000..b3f487d
new file mode 100644
--- /dev/null
+++ b/debian/patches/0009-Revert-Use-pymysql-as-a-drop-in-replacement-for-MySQ.patch
@@@ -1,0 -1,0 +1,24 @@@
++From 5e63252dd39776080eb2604958f0a735c1dbcc06 Mon Sep 17 00:00:00 2001
++From: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
++Date: Tue, 24 May 2016 15:06:13 +0200
++Subject: Revert "Use pymysql as a drop-in replacement for MySQLdb."
++
++This reverts commit 665ea0e820a18f441329cdcf9f104278c32ffd99.
++---
++ demos/blog/blog.py | 3 ---
++ 1 file changed, 3 deletions(-)
++
++diff --git a/demos/blog/blog.py b/demos/blog/blog.py
++index 14dd699..c78e532 100755
++--- a/demos/blog/blog.py
+++++ b/demos/blog/blog.py
++@@ -14,9 +14,6 @@
++ # 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 5e65080,0000000..f3dcbff
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,8 -1,0 +1,9 @@@
 +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
++0009-Revert-Use-pymysql-as-a-drop-in-replacement-for-MySQ.patch

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