Update hacking for Python3

The repo is Python 3 now, so update hacking to version 3.0 which
supports Python 3.

Fix problems found.

Change-Id: Ic161a8f88c28d88898863e5b9d9380016fbb0d08
This commit is contained in:
Andreas Jaeger 2020-03-31 12:11:21 +02:00
parent 526350eaee
commit e25df2943d
8 changed files with 13 additions and 3 deletions

View File

@ -84,6 +84,7 @@ def generate_der_form(name):
SIGNING_KEY_FILE_NAME, cms.PKIZ_CMS_FORM)
f.write(derform)
for name in EXAMPLE_TOKENS:
json_file = make_filename('cms', name + '.json')
pkiz_file = make_filename('cms', name + '.pkiz')

View File

@ -10,6 +10,7 @@
# License for the specific language governing permissions and limitations
# under the License.
# flake8: noqa: F405
from keystoneclient.auth.base import * # noqa
from keystoneclient.auth.cli import * # noqa

View File

@ -10,6 +10,8 @@
# License for the specific language governing permissions and limitations
# under the License.
# flake8: noqa: F405
from keystoneclient.auth.identity.v3.base import * # noqa
from keystoneclient.auth.identity.v3.federated import * # noqa
from keystoneclient.auth.identity.v3.password import * # noqa

View File

@ -225,7 +225,7 @@ class Ec2Signer(object):
# port if we detect an old boto version. FIXME: remove when all
# distros package boto >= 2.9.3, this is a transitional workaround
user_agent = headers_lower.get('user-agent', '')
strip_port = re.match('Boto/2\.[0-9]\.[0-2]', user_agent)
strip_port = re.match(r'Boto/2\.[0-9]\.[0-2]', user_agent)
header_list = []
sh_str = auth_param('SignedHeaders')

View File

@ -376,6 +376,7 @@ class CMSError(Exception):
msg = _('Unable to sign or verify data.')
super(CMSError, self).__init__(msg)
EmptyCatalog = _exc.EmptyCatalog
"""The service catalog is empty.
@ -398,6 +399,7 @@ An alias of :py:exc:`keystoneauth1.exceptions.discovery.VersionNotAvailable`
class MethodNotImplemented(ClientException):
"""Method not implemented by the keystoneclient API."""
MissingAuthPlugin = _exc.MissingAuthPlugin
"""An authenticated request is required but no plugin available.

View File

@ -28,6 +28,8 @@ testing.
"""
# flake8: noqa: F405
import warnings
from keystoneclient.fixture.discovery import * # noqa

View File

@ -2,7 +2,7 @@
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
hacking>=1.1.0,<1.2.0 # Apache-2.0
hacking>=3.0,<3.1.0 # Apache-2.0
flake8-docstrings==0.2.1.post1 # MIT
coverage!=4.4,>=4.0 # Apache-2.0

View File

@ -58,7 +58,9 @@ passenv = OS_*
# D103: Missing docstring in public function
# D104: Missing docstring in public package
# D203: 1 blank line required before class docstring (deprecated in pep257)
ignore = D100,D101,D102,D103,D104,D203
# W504 line break after binary operator
# F601 dictionary key repeated with different value
ignore = D100,D101,D102,D103,D104,D203,W504,F601
show-source = True
exclude = .venv,.tox,dist,doc,*egg,build