Merge remote-tracking branch 'origin/3.6' into 3.7

3 files changed, 74 insertions, 74 deletions

diff --git a/python3-bowler/.footprint b/python3-bowler/.footprint
index 9ec8093cf..a1e8f7c2a 100644
--- a/python3-bowler/.footprint
+++ b/python3-bowler/.footprint
@@ -2,73 +2,73 @@ drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/bowler
 drwxr-xr-x	root/root	usr/lib/
-drwxr-xr-x	root/root	usr/lib/python3.9/
-drwxr-xr-x	root/root	usr/lib/python3.9/site-packages/
-drwxr-xr-x	root/root	usr/lib/python3.9/site-packages/bowler-0.9.0-py3.9.egg-info/
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/bowler-0.9.0-py3.9.egg-info/PKG-INFO
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/bowler-0.9.0-py3.9.egg-info/SOURCES.txt
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/bowler-0.9.0-py3.9.egg-info/dependency_links.txt
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/bowler-0.9.0-py3.9.egg-info/entry_points.txt
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/bowler-0.9.0-py3.9.egg-info/requires.txt
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/bowler-0.9.0-py3.9.egg-info/top_level.txt
-drwxr-xr-x	root/root	usr/lib/python3.9/site-packages/bowler/
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/bowler/__init__.py
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/bowler/__main__.py
-drwxr-xr-x	root/root	usr/lib/python3.9/site-packages/bowler/__pycache__/
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/bowler/__pycache__/__init__.cpython-39.opt-1.pyc
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/bowler/__pycache__/__init__.cpython-39.pyc
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/bowler/__pycache__/__main__.cpython-39.opt-1.pyc
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/bowler/__pycache__/__main__.cpython-39.pyc
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/bowler/__pycache__/helpers.cpython-39.opt-1.pyc
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/bowler/__pycache__/helpers.cpython-39.pyc
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/bowler/__pycache__/imr.cpython-39.opt-1.pyc
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/bowler/__pycache__/imr.cpython-39.pyc
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/bowler/__pycache__/main.cpython-39.opt-1.pyc
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/bowler/__pycache__/main.cpython-39.pyc
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/bowler/__pycache__/query.cpython-39.opt-1.pyc
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/bowler/__pycache__/query.cpython-39.pyc
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/bowler/__pycache__/tool.cpython-39.opt-1.pyc
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/bowler/__pycache__/tool.cpython-39.pyc
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/bowler/__pycache__/type_inference.cpython-39.opt-1.pyc
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/bowler/__pycache__/type_inference.cpython-39.pyc
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/bowler/__pycache__/types.cpython-39.opt-1.pyc
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/bowler/__pycache__/types.cpython-39.pyc
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/bowler/helpers.py
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/bowler/imr.py
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/bowler/main.py
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/bowler/query.py
-drwxr-xr-x	root/root	usr/lib/python3.9/site-packages/bowler/tests/
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/bowler/tests/__init__.py
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/bowler/tests/__main__.py
-drwxr-xr-x	root/root	usr/lib/python3.9/site-packages/bowler/tests/__pycache__/
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/bowler/tests/__pycache__/__init__.cpython-39.opt-1.pyc
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/bowler/tests/__pycache__/__init__.cpython-39.pyc
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/bowler/tests/__pycache__/__main__.cpython-39.opt-1.pyc
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/bowler/tests/__pycache__/__main__.cpython-39.pyc
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/bowler/tests/__pycache__/helpers.cpython-39.opt-1.pyc
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/bowler/tests/__pycache__/helpers.cpython-39.pyc
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/bowler/tests/__pycache__/lib.cpython-39.opt-1.pyc
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/bowler/tests/__pycache__/lib.cpython-39.pyc
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/bowler/tests/__pycache__/query.cpython-39.opt-1.pyc
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/bowler/tests/__pycache__/query.cpython-39.pyc
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/bowler/tests/__pycache__/smoke-selftest.cpython-39.opt-1.pyc
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/bowler/tests/__pycache__/smoke-selftest.cpython-39.pyc
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/bowler/tests/__pycache__/smoke-target.cpython-39.opt-1.pyc
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/bowler/tests/__pycache__/smoke-target.cpython-39.pyc
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/bowler/tests/__pycache__/smoke.cpython-39.opt-1.pyc
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/bowler/tests/__pycache__/smoke.cpython-39.pyc
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/bowler/tests/__pycache__/tool.cpython-39.opt-1.pyc
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/bowler/tests/__pycache__/tool.cpython-39.pyc
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/bowler/tests/__pycache__/type_inference.cpython-39.opt-1.pyc
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/bowler/tests/__pycache__/type_inference.cpython-39.pyc
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/bowler/tests/helpers.py
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/bowler/tests/lib.py
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/bowler/tests/query.py
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/bowler/tests/smoke-selftest.py
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/bowler/tests/smoke-target.py
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/bowler/tests/smoke.py
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/bowler/tests/tool.py
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/bowler/tests/type_inference.py
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/bowler/tool.py
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/bowler/type_inference.py
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/bowler/types.py
+drwxr-xr-x	root/root	usr/lib/python3.10/
+drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/
+drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/bowler-0.9.0-py3.10.egg-info/
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/bowler-0.9.0-py3.10.egg-info/PKG-INFO
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/bowler-0.9.0-py3.10.egg-info/SOURCES.txt
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/bowler-0.9.0-py3.10.egg-info/dependency_links.txt
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/bowler-0.9.0-py3.10.egg-info/entry_points.txt
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/bowler-0.9.0-py3.10.egg-info/requires.txt
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/bowler-0.9.0-py3.10.egg-info/top_level.txt
+drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/bowler/
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/bowler/__init__.py
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/bowler/__main__.py
+drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/bowler/__pycache__/
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/bowler/__pycache__/__init__.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/bowler/__pycache__/__init__.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/bowler/__pycache__/__main__.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/bowler/__pycache__/__main__.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/bowler/__pycache__/helpers.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/bowler/__pycache__/helpers.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/bowler/__pycache__/imr.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/bowler/__pycache__/imr.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/bowler/__pycache__/main.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/bowler/__pycache__/main.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/bowler/__pycache__/query.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/bowler/__pycache__/query.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/bowler/__pycache__/tool.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/bowler/__pycache__/tool.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/bowler/__pycache__/type_inference.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/bowler/__pycache__/type_inference.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/bowler/__pycache__/types.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/bowler/__pycache__/types.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/bowler/helpers.py
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/bowler/imr.py
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/bowler/main.py
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/bowler/query.py
+drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/bowler/tests/
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/bowler/tests/__init__.py
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/bowler/tests/__main__.py
+drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/bowler/tests/__pycache__/
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/bowler/tests/__pycache__/__init__.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/bowler/tests/__pycache__/__init__.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/bowler/tests/__pycache__/__main__.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/bowler/tests/__pycache__/__main__.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/bowler/tests/__pycache__/helpers.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/bowler/tests/__pycache__/helpers.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/bowler/tests/__pycache__/lib.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/bowler/tests/__pycache__/lib.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/bowler/tests/__pycache__/query.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/bowler/tests/__pycache__/query.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/bowler/tests/__pycache__/smoke-selftest.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/bowler/tests/__pycache__/smoke-selftest.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/bowler/tests/__pycache__/smoke-target.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/bowler/tests/__pycache__/smoke-target.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/bowler/tests/__pycache__/smoke.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/bowler/tests/__pycache__/smoke.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/bowler/tests/__pycache__/tool.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/bowler/tests/__pycache__/tool.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/bowler/tests/__pycache__/type_inference.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/bowler/tests/__pycache__/type_inference.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/bowler/tests/helpers.py
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/bowler/tests/lib.py
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/bowler/tests/query.py
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/bowler/tests/smoke-selftest.py
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/bowler/tests/smoke-target.py
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/bowler/tests/smoke.py
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/bowler/tests/tool.py
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/bowler/tests/type_inference.py
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/bowler/tool.py
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/bowler/type_inference.py
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/bowler/types.py
diff --git a/python3-bowler/.signature b/python3-bowler/.signature
index 98e9d2440..53cd42741 100644
--- a/python3-bowler/.signature
+++ b/python3-bowler/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF36BeVjzZ/NBzM8VufumaufQCgg2pg6diX4vR3HO/QWA206froMoyxirl4y/eEnL1/iWkpEGMxs9us3wekiNfAg4=
-SHA256 (Pkgfile) = f8cfaccdb591add889819e6b2f28211ee2cd3f99524b4f74e67b6a90c8a41464
-SHA256 (.footprint) = 74194128bda1140cf4f6938b44d2ff28b29b5be556901d18e6961ad98a86dbc8
+RWSagIOpLGJF3/WJvWbFMrBqR907xNjmoC2bv90649Yy5XCLhyKlDg+nCIWIazmwwF2+d7OsTK1Z2rZ54GHuaIH70SZPSTX1dwI=
+SHA256 (Pkgfile) = 68d9ddb8943cc174283301a82f79693a115b5a8fe2b71e270d21dc4ccd28510c
+SHA256 (.footprint) = 254a37379599ef4193183b2aec7708704909c93968353cf83bb73efa4bea4229
 SHA256 (bowler-0.9.0.tar.gz) = cdb85ce2e7bd545802a15d755d1daf2b6a125429355c50d2019a9f35d63e45db
diff --git a/python3-bowler/Pkgfile b/python3-bowler/Pkgfile
index 10bfcc6dc..b5b44654e 100644
--- a/python3-bowler/Pkgfile
+++ b/python3-bowler/Pkgfile
@@ -1,7 +1,7 @@
 # Description: Safe code refactoring for modern Python
 # URL: https://github.com/facebookincubator/bowler
 # Maintainer: Tim Biermann, tbier at posteo dot de
-# Depends on: python3-attrs python3-click python3-fissix python3-sh
+# Depends on: python3-attrs python3-click python3-fissix python3-sh python3-moreorless python3-volatile
 
 name=python3-bowler
 version=0.9.0