From 5e1dd97cb61cb5ff6f6f83fa734253819b885cb2 Mon Sep 17 00:00:00 2001 From: Inada Naoki Date: Fri, 29 Nov 2019 17:25:53 +0900 Subject: [PATCH] Drop Django 1.11 support --- .travis.yml | 16 +++++++--------- MySQLdb/cursors.py | 7 ------- 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4d3e0108..865c00f9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,10 +37,10 @@ after_success: matrix: include: - - &django_1_11 - name: "Django 1.11 test (Python 3.7)" + - &django_2_2 + name: "Django 2.2 test (Python 3.5)" env: - - DJANGO_VERSION=1.11.26 + - DJANGO_VERSION=2.2.7 python: "3.5" install: - pip install -U pip @@ -59,11 +59,9 @@ matrix: - cd django-${DJANGO_VERSION}/tests/ - ./runtests.py --parallel=1 --settings=test_mysql - - &django_2_2 - <<: *django_py27 - name: "Django 2.2 test (Python 3.8)" - python: "3.8" - env: - - DJANGO_VERSION=2.2.7 + #- &django_3_0 + # <<: *django_2_2 + # name: "Django 3.0 test (Python 3.8)" + # python: "3.8" # vim: sw=2 ts=2 sts=2 diff --git a/MySQLdb/cursors.py b/MySQLdb/cursors.py index 056bb542..c70d0f3d 100644 --- a/MySQLdb/cursors.py +++ b/MySQLdb/cursors.py @@ -62,13 +62,6 @@ def __init__(self, connection): self.arraysize = 1 self._executed = None - # XXX THIS IS GARBAGE: While this is totally garbage and private, - # Django 1.11 depends on it. And they don't fix it because - # they are in security-only fix mode. - # So keep this garbage for now. This will be removed in 1.5. - # See PyMySQL/mysqlclient-python#303 - self._last_executed = None - self.lastrowid = None self.messages = [] self._result = None