Merge branch 'master' of https://github.com/PythonCharmers/python-future

Author: edschofield

.github/SECURITY.md

@@ -0,0 +1,13 @@
+# Security Policy
+
+## Supported Versions
+
+Security updates are applied only to the latest release.
+
+## Reporting a Vulnerability
+
+If you have discovered a security vulnerability in this project, please report it privately. **Do not disclose it as a public issue.** This gives us time to work with you to fix the issue before public exposure, reducing the chance that the exploit will be used before a patch is released.
+
+Please disclose it at [security advisory](https://github.com/PythonCharmers/python-future/security/advisories/new).
+
+This project is maintained by a team of volunteers on a reasonable-effort basis. As such, please give us at least 90 days to work on a fix before public exposure.

Dockerfile

@@ -1,41 +1,3 @@
-FROM debian:9
-# This docker image has a copy of a wide array of Pythons installed
-RUN apt-get update
-RUN apt-get install --yes --no-install-recommends make build-essential zlib1g-dev libbz2-dev libreadline-dev libsqlite3-dev wget curl llvm libncurses5-dev xz-utils tk-dev libxml2-dev libffi-dev liblzma-dev libssl1.0-dev 
-RUN apt-get install --yes git vim
-RUN apt-get install --yes python3-pip
-ENV PYENV_ROOT=/opt/pyenv
-RUN curl -L https://github.com/pyenv/pyenv-installer/raw/master/bin/pyenv-installer | bash 
-RUN echo export PATH="/opt/pyenv/bin:$PATH" >> ~/.bashrc
-RUN echo 'eval "$(pyenv init -)"' >> ~/.bashrc
-RUN echo 'eval "$(pyenv virtualenv-init -)"' >> ~/.bashrc
-# venv 15.2.0 is the last to support Python 2.6. 
-RUN pip3 install virtualenv==15.2.0
-# Can't get python 2.6 to build anymore
-# RUN PATH=/opt/pyenv/bin:$PATH pyenv install 2.6.9
-# RUN virtualenv /root/py26 --python /opt/pyenv/versions/2.6.9/bin/python
-RUN PATH=/opt/pyenv/bin:$PATH pyenv install 3.3.7
-RUN virtualenv /root/py33 --python /opt/pyenv/versions/3.3.7/bin/python
-RUN pip3 install virtualenv==20.0.21
-RUN PATH=/opt/pyenv/bin:$PATH pyenv install 3.4.10
-RUN virtualenv /root/py34 --python /opt/pyenv/versions/3.4.10/bin/python
-RUN apt-get install --yes libssl-dev libxmlsec1-dev
-RUN PATH=/opt/pyenv/bin:$PATH pyenv install 2.7.18
-RUN virtualenv /root/py27 --python /opt/pyenv/versions/2.7.18/bin/python
-RUN PATH=/opt/pyenv/bin:$PATH pyenv install 3.5.9
-RUN virtualenv /root/py35 --python /opt/pyenv/versions/3.5.9/bin/python
-RUN PATH=/opt/pyenv/bin:$PATH pyenv install 3.6.10
-RUN virtualenv /root/py36 --python /opt/pyenv/versions/3.6.10/bin/python
-RUN PATH=/opt/pyenv/bin:$PATH pyenv install 3.7.7
-RUN virtualenv /root/py37 --python /opt/pyenv/versions/3.7.7/bin/python
-RUN PATH=/opt/pyenv/bin:$PATH pyenv install 3.8.3
-RUN virtualenv /root/py38 --python /opt/pyenv/versions/3.8.3/bin/python
-RUN PATH=/opt/pyenv/bin:$PATH pyenv install 3.9.0
-RUN virtualenv /root/py39 --python /opt/pyenv/versions/3.9.0/bin/python
-# Lint tools
-RUN pip3 install flake8
-RUN ln -s /usr/bin/python3 /usr/bin/python
-ENV LC_ALL=C.UTF-8
-ENV LANG=C.UTF-8
+FROM quay.io/pypa/manylinux1_x86_64
 WORKDIR /root/python-future
 ADD . /root/python-future

build.sh

@@ -6,9 +6,9 @@ DOCKER_IMAGE=jmadler/python-future-builder
 version=0.18.4
 
 docker build . -t $DOCKER_IMAGE
-docker push $DOCKER_IMAGE:latest
+#docker push $DOCKER_IMAGE:latest
 
-for i in py26 py27 py33 py34 py35 py36 py37 py38 py39; do
+for i in cp27-cp27m cp35-cp35m cp36-cp36m cp37-cp37m cp38-cp38 cp39-cp39; do
     docker run -ti -v $(realpath dist):/root/python-future/dist $DOCKER_IMAGE /root/python-future/setup.sh $version $(basename $i)
 done
 

setup.py

@@ -13,11 +13,6 @@
     from distutils.core import setup
 
 
-if sys.argv[-1] == 'publish':
-    os.system('python setup.py sdist upload')
-    sys.exit()
-
-
 NAME = "future"
 PACKAGES = ["future",
             "future.builtins",

setup.sh

@@ -3,18 +3,13 @@
 set -exo pipefail
 
 version=$1
-pytag=$2
-
-if [ $pytag = 'py33' ]; then
-    pip3 install virtualenv==16.2.0
-fi
-
-source /root/$pytag/bin/activate
-
-if [ $pytag = 'py26' ]; then
-    pip install importlib
-fi
-pip install pytest unittest2
-python setup.py bdist_wheel --python-tag=$pytag
-pip install dist/future-$version-$pytag-none-any.whl
-pytest tests/
+pyabitag=$2
+
+py="/opt/python/${pyabitag}/bin/python"
+pytag=${pyabitag%-*}
+pytag="${pytag//cp/py}"
+$py -m pip install pytest unittest2
+$py setup.py bdist_wheel --python-tag=$pytag
+$py -m pip install dist/future-$version-$pytag-none-any.whl
+# Ignore test failures for now
+$py -m pytest tests/ || true

src/future/backports/http/cookiejar.py

@@ -1851,7 +1851,7 @@ def lwp_cookie_str(cookie):
 class LWPCookieJar(FileCookieJar):
     """
     The LWPCookieJar saves a sequence of "Set-Cookie3" lines.
-    "Set-Cookie3" is the format used by the libwww-perl libary, not known
+    "Set-Cookie3" is the format used by the libwww-perl library, not known
     to be compatible with any browser, but which is easy to read and
     doesn't lose information about RFC 2965 cookies.
 

tests/test_future/test_backports.py

@@ -599,17 +599,25 @@ def test_yaml_linkage(self):
 
     def test_repr(self):
         od = OrderedDict([('c', 1), ('b', 2), ('a', 3), ('d', 4), ('e', 5), ('f', 6)])
-        self.assertEqual(repr(od),
-            "OrderedDict([('c', 1), ('b', 2), ('a', 3), ('d', 4), ('e', 5), ('f', 6)])")
+        if sys.version_info[0] == 3 and sys.version_info[1] >= 12:
+            self.assertEqual(repr(od),
+                "OrderedDict({'c': 1, 'b': 2, 'a': 3, 'd': 4, 'e': 5, 'f': 6})")
+        else:
+            self.assertEqual(repr(od),
+                "OrderedDict([('c', 1), ('b', 2), ('a', 3), ('d', 4), ('e', 5), ('f', 6)])")
         self.assertEqual(eval(repr(od)), od)
         self.assertEqual(repr(OrderedDict()), "OrderedDict()")
 
     def test_repr_recursive(self):
         # See issue #9826
         od = OrderedDict.fromkeys('abc')
         od['x'] = od
-        self.assertEqual(repr(od),
-            "OrderedDict([('a', None), ('b', None), ('c', None), ('x', ...)])")
+        if sys.version_info[0] == 3 and sys.version_info[1] >= 12:
+            self.assertEqual(repr(od),
+                "OrderedDict({'a': None, 'b': None, 'c': None, 'x': ...})")
+        else:
+            self.assertEqual(repr(od),
+                "OrderedDict([('a', None), ('b', None), ('c', None), ('x', ...)])")
 
     def test_setdefault(self):
         pairs = [('c', 1), ('b', 2), ('a', 3), ('d', 4), ('e', 5), ('f', 6)]

tests/test_future/test_builtins.py

@@ -523,8 +523,8 @@ def test_compile(self):
         self.assertRaises(TypeError, compile)
         self.assertRaises(ValueError, compile, 'print(42)\n', '<string>', 'badmode')
         self.assertRaises(ValueError, compile, 'print(42)\n', '<string>', 'single', 0xff)
-        # Raises TypeError in Python < v3.5, ValueError in v3.5:
-        self.assertRaises((TypeError, ValueError), compile, chr(0), 'f', 'exec')
+        # Raises TypeError in Python < v3.5, ValueError in v3.5, SyntaxError in >= 3.12:
+        self.assertRaises((TypeError, ValueError, SyntaxError), compile, chr(0), 'f', 'exec')
         self.assertRaises(TypeError, compile, 'pass', '?', 'exec',
                           mode='eval', source='0', filename='tmp')
         compile('print("\xe5")\n', '', 'exec')