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:
		| @@ -84,6 +84,7 @@ def generate_der_form(name): | |||||||
|                                     SIGNING_KEY_FILE_NAME, cms.PKIZ_CMS_FORM) |                                     SIGNING_KEY_FILE_NAME, cms.PKIZ_CMS_FORM) | ||||||
|         f.write(derform) |         f.write(derform) | ||||||
|  |  | ||||||
|  |  | ||||||
| for name in EXAMPLE_TOKENS: | for name in EXAMPLE_TOKENS: | ||||||
|     json_file = make_filename('cms', name + '.json') |     json_file = make_filename('cms', name + '.json') | ||||||
|     pkiz_file = make_filename('cms', name + '.pkiz') |     pkiz_file = make_filename('cms', name + '.pkiz') | ||||||
|   | |||||||
| @@ -10,6 +10,7 @@ | |||||||
| # License for the specific language governing permissions and limitations | # License for the specific language governing permissions and limitations | ||||||
| # under the License. | # under the License. | ||||||
|  |  | ||||||
|  | # flake8: noqa: F405 | ||||||
|  |  | ||||||
| from keystoneclient.auth.base import *  # noqa | from keystoneclient.auth.base import *  # noqa | ||||||
| from keystoneclient.auth.cli import *  # noqa | from keystoneclient.auth.cli import *  # noqa | ||||||
|   | |||||||
| @@ -10,6 +10,8 @@ | |||||||
| # License for the specific language governing permissions and limitations | # License for the specific language governing permissions and limitations | ||||||
| # under the License. | # under the License. | ||||||
|  |  | ||||||
|  | # flake8: noqa: F405 | ||||||
|  |  | ||||||
| from keystoneclient.auth.identity.v3.base import *  # noqa | from keystoneclient.auth.identity.v3.base import *  # noqa | ||||||
| from keystoneclient.auth.identity.v3.federated import *  # noqa | from keystoneclient.auth.identity.v3.federated import *  # noqa | ||||||
| from keystoneclient.auth.identity.v3.password import *  # noqa | from keystoneclient.auth.identity.v3.password import *  # noqa | ||||||
|   | |||||||
| @@ -225,7 +225,7 @@ class Ec2Signer(object): | |||||||
|             # port if we detect an old boto version.  FIXME: remove when all |             # port if we detect an old boto version.  FIXME: remove when all | ||||||
|             # distros package boto >= 2.9.3, this is a transitional workaround |             # distros package boto >= 2.9.3, this is a transitional workaround | ||||||
|             user_agent = headers_lower.get('user-agent', '') |             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 = [] |             header_list = [] | ||||||
|             sh_str = auth_param('SignedHeaders') |             sh_str = auth_param('SignedHeaders') | ||||||
|   | |||||||
| @@ -376,6 +376,7 @@ class CMSError(Exception): | |||||||
|         msg = _('Unable to sign or verify data.') |         msg = _('Unable to sign or verify data.') | ||||||
|         super(CMSError, self).__init__(msg) |         super(CMSError, self).__init__(msg) | ||||||
|  |  | ||||||
|  |  | ||||||
| EmptyCatalog = _exc.EmptyCatalog | EmptyCatalog = _exc.EmptyCatalog | ||||||
| """The service catalog is empty. | """The service catalog is empty. | ||||||
|  |  | ||||||
| @@ -398,6 +399,7 @@ An alias of :py:exc:`keystoneauth1.exceptions.discovery.VersionNotAvailable` | |||||||
| class MethodNotImplemented(ClientException): | class MethodNotImplemented(ClientException): | ||||||
|     """Method not implemented by the keystoneclient API.""" |     """Method not implemented by the keystoneclient API.""" | ||||||
|  |  | ||||||
|  |  | ||||||
| MissingAuthPlugin = _exc.MissingAuthPlugin | MissingAuthPlugin = _exc.MissingAuthPlugin | ||||||
| """An authenticated request is required but no plugin available. | """An authenticated request is required but no plugin available. | ||||||
|  |  | ||||||
|   | |||||||
| @@ -28,6 +28,8 @@ testing. | |||||||
|  |  | ||||||
| """ | """ | ||||||
|  |  | ||||||
|  | # flake8: noqa: F405 | ||||||
|  |  | ||||||
| import warnings | import warnings | ||||||
|  |  | ||||||
| from keystoneclient.fixture.discovery import *  # noqa | from keystoneclient.fixture.discovery import *  # noqa | ||||||
|   | |||||||
| @@ -2,7 +2,7 @@ | |||||||
| # of appearance. Changing the order has an impact on the overall integration | # of appearance. Changing the order has an impact on the overall integration | ||||||
| # process, which may cause wedges in the gate later. | # 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 | flake8-docstrings==0.2.1.post1 # MIT | ||||||
|  |  | ||||||
| coverage!=4.4,>=4.0 # Apache-2.0 | coverage!=4.4,>=4.0 # Apache-2.0 | ||||||
|   | |||||||
							
								
								
									
										4
									
								
								tox.ini
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								tox.ini
									
									
									
									
									
								
							| @@ -58,7 +58,9 @@ passenv = OS_* | |||||||
| # D103: Missing docstring in public function | # D103: Missing docstring in public function | ||||||
| # D104: Missing docstring in public package | # D104: Missing docstring in public package | ||||||
| # D203: 1 blank line required before class docstring (deprecated in pep257) | # 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 | show-source = True | ||||||
| exclude = .venv,.tox,dist,doc,*egg,build | exclude = .venv,.tox,dist,doc,*egg,build | ||||||
|  |  | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Andreas Jaeger
					Andreas Jaeger