From a77ffff99b6598a8451555707a4dd842b0fa04d4 Mon Sep 17 00:00:00 2001 From: Bu Sun Kim Date: Fri, 11 Mar 2022 02:03:36 +0000 Subject: [PATCH 1/6] chore(deps): allow google-api-core v2 on v2 release --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index fb2dc075..980426ff 100644 --- a/setup.py +++ b/setup.py @@ -29,7 +29,7 @@ # 'Development Status :: 5 - Production/Stable' release_status = "Development Status :: 5 - Production/Stable" dependencies = [ - "google-api-core[grpc] >= 1.15.0, < 2.0.0dev", + "google-api-core[grpc] >= 1.31.5, <3.0.0dev,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.0", "google-cloud-core >= 1.1.0, < 2.0dev", ] extras = {} From 9d5ee7f276f6d5104dad5c3e797740b0dd1fd71f Mon Sep 17 00:00:00 2001 From: Tim Swast Date: Tue, 6 Oct 2020 16:41:48 -0500 Subject: [PATCH 2/6] test: update tests to support latest google-cloud-core (#69) `google-cloud-core` version 1.4.2 populates `prettyPrint=false` by default. Update the connection tests to expect a value for `prettyPrint`. --- tests/unit/v2/test__http.py | 57 ++++++++++++++++++++++++++++--------- 1 file changed, 43 insertions(+), 14 deletions(-) diff --git a/tests/unit/v2/test__http.py b/tests/unit/v2/test__http.py index 4830c0c8..c48cc4bb 100644 --- a/tests/unit/v2/test__http.py +++ b/tests/unit/v2/test__http.py @@ -28,30 +28,56 @@ def _make_one(self, *args, **kw): return self._get_target_class()(*args, **kw) def test_build_api_url_no_extra_query_params(self): + from six.moves.urllib.parse import parse_qsl + from six.moves.urllib.parse import urlsplit + conn = self._make_one(object()) - URI = "/".join( - [ - conn.DEFAULT_API_ENDPOINT, - "language", - "translate", - conn.API_VERSION, - "foo", - ] + uri = conn.build_api_url("/foo") + scheme, netloc, path, qs, _ = urlsplit(uri) + self.assertEqual("%s://%s" % (scheme, netloc), conn.API_BASE_URL) + self.assertEqual( + path, "/".join(["", "language", "translate", conn.API_VERSION, "foo"]) ) - self.assertEqual(conn.build_api_url("/foo"), URI) + parms = dict(parse_qsl(qs)) + pretty_print = parms.pop("prettyPrint", "false") + self.assertEqual(pretty_print, "false") + self.assertEqual(parms, {}) def test_build_api_url_w_custom_endpoint(self): + from six.moves.urllib.parse import parse_qsl + from six.moves.urllib.parse import urlsplit + custom_endpoint = "https://foo-translation.googleapis.com" conn = self._make_one(object(), api_endpoint=custom_endpoint) - URI = "/".join( - [custom_endpoint, "language", "translate", conn.API_VERSION, "foo"] + uri = conn.build_api_url("/foo") + scheme, netloc, path, qs, _ = urlsplit(uri) + self.assertEqual("%s://%s" % (scheme, netloc), custom_endpoint) + self.assertEqual( + path, "/".join(["", "language", "translate", conn.API_VERSION, "foo"]) ) - self.assertEqual(conn.build_api_url("/foo"), URI) + parms = dict(parse_qsl(qs)) + pretty_print = parms.pop("prettyPrint", "false") + self.assertEqual(pretty_print, "false") + self.assertEqual(parms, {}) def test_build_api_url_w_extra_query_params(self): from six.moves.urllib.parse import parse_qsl from six.moves.urllib.parse import urlsplit + conn = self._make_one(object()) + uri = conn.build_api_url("/foo", {"bar": "baz"}) + scheme, netloc, path, qs, _ = urlsplit(uri) + self.assertEqual("%s://%s" % (scheme, netloc), conn.API_BASE_URL) + self.assertEqual( + path, "/".join(["", "language", "translate", conn.API_VERSION, "foo"]) + ) + parms = dict(parse_qsl(qs)) + self.assertEqual(parms["bar"], "baz") + + def test_build_api_url_w_extra_query_params_tuple(self): + from six.moves.urllib.parse import parse_qsl + from six.moves.urllib.parse import urlsplit + conn = self._make_one(object()) query_params = [("q", "val1"), ("q", "val2")] uri = conn.build_api_url("/foo", query_params=query_params) @@ -59,8 +85,11 @@ def test_build_api_url_w_extra_query_params(self): self.assertEqual("%s://%s" % (scheme, netloc), conn.API_BASE_URL) expected_path = "/".join(["", "language", "translate", conn.API_VERSION, "foo"]) self.assertEqual(path, expected_path) - params = parse_qsl(qs) - self.assertEqual(params, query_params) + params = list( + sorted(param for param in parse_qsl(qs) if param[0] != "prettyPrint") + ) + expected_params = [("q", "val1"), ("q", "val2")] + self.assertEqual(params, expected_params) def test_extra_headers(self): import requests From 9e524ec468e3bda8cb57ab7bb1c68ac4bbf16038 Mon Sep 17 00:00:00 2001 From: Anthonios Partheniou Date: Sat, 12 Mar 2022 19:33:54 +0000 Subject: [PATCH 3/6] ci: fix docs build --- noxfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/noxfile.py b/noxfile.py index c8e9c95f..bce002fd 100644 --- a/noxfile.py +++ b/noxfile.py @@ -172,7 +172,7 @@ def docfx(session): """Build the docfx yaml files for this library.""" session.install("-e", ".") - session.install("sphinx<3.0.0", "alabaster", "recommonmark", "sphinx-docfx-yaml") + session.install("sphinx<3.0.0", "alabaster", "recommonmark", "gcp-sphinx-docfx-yaml") shutil.rmtree(os.path.join("docs", "_build"), ignore_errors=True) session.run( From d39d897c6b3dcbe55397dc58852ab3461c5ecf13 Mon Sep 17 00:00:00 2001 From: Anthonios Partheniou Date: Sun, 13 Mar 2022 14:49:34 +0000 Subject: [PATCH 4/6] chore: lint --- noxfile.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/noxfile.py b/noxfile.py index bce002fd..5d4bd4ff 100644 --- a/noxfile.py +++ b/noxfile.py @@ -172,7 +172,9 @@ def docfx(session): """Build the docfx yaml files for this library.""" session.install("-e", ".") - session.install("sphinx<3.0.0", "alabaster", "recommonmark", "gcp-sphinx-docfx-yaml") + session.install( + "sphinx<3.0.0", "alabaster", "recommonmark", "gcp-sphinx-docfx-yaml" + ) shutil.rmtree(os.path.join("docs", "_build"), ignore_errors=True) session.run( From 83c782d85c3943a1925f599668fa9483aa82e5c8 Mon Sep 17 00:00:00 2001 From: Bu Sun Kim <8822365+busunkim96@users.noreply.github.com> Date: Thu, 31 Mar 2022 15:42:59 -0600 Subject: [PATCH 5/6] Update setup.py Co-authored-by: Anthonios Partheniou --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 980426ff..de8ed29f 100644 --- a/setup.py +++ b/setup.py @@ -30,7 +30,7 @@ release_status = "Development Status :: 5 - Production/Stable" dependencies = [ "google-api-core[grpc] >= 1.31.5, <3.0.0dev,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.0", - "google-cloud-core >= 1.1.0, < 2.0dev", + "google-cloud-core >= 1.1.0, < 3.0dev", ] extras = {} From 0977284305c3b10ba77aa63da576eb37161442f3 Mon Sep 17 00:00:00 2001 From: Bu Sun Kim Date: Thu, 31 Mar 2022 21:55:10 +0000 Subject: [PATCH 6/6] chore: format, revert changes to tests --- docs/conf.py | 17 +++++----- .../gapic/translation_service_client.py | 31 ++++++++++++++----- .../proto/translation_service_pb2.py | 25 +++++++++++---- .../proto/translation_service_pb2_grpc.py | 9 ++---- .../gapic/translation_service_client.py | 31 ++++++++++++++----- .../proto/translation_service_pb2.py | 25 +++++++++++---- .../proto/translation_service_pb2_grpc.py | 9 ++---- noxfile.py | 13 +++++--- tests/system.py | 9 +++--- tests/unit/v2/test__http.py | 26 ++++++---------- tests/unit/v2/test_client.py | 2 +- 11 files changed, 124 insertions(+), 73 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index f70d6a32..8a32dae7 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -65,9 +65,9 @@ master_doc = "index" # General information about the project. -project = u"google-cloud-translate" -copyright = u"2019, Google" -author = u"Google APIs" +project = "google-cloud-translate" +copyright = "2019, Google" +author = "Google APIs" # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the @@ -261,7 +261,7 @@ ( master_doc, "google-cloud-translate.tex", - u"google-cloud-translate Documentation", + "google-cloud-translate Documentation", author, "manual", ) @@ -296,7 +296,7 @@ ( master_doc, "google-cloud-translate", - u"google-cloud-translate Documentation", + "google-cloud-translate Documentation", [author], 1, ) @@ -315,7 +315,7 @@ ( master_doc, "google-cloud-translate", - u"google-cloud-translate Documentation", + "google-cloud-translate Documentation", author, "google-cloud-translate", "google-cloud-translate Library", @@ -340,7 +340,10 @@ intersphinx_mapping = { "python": ("http://python.readthedocs.org/en/latest/", None), "google-auth": ("https://google-auth.readthedocs.io/en/stable", None), - "google.api_core": ("https://googleapis.dev/python/google-api-core/latest/", None,), + "google.api_core": ( + "https://googleapis.dev/python/google-api-core/latest/", + None, + ), "grpc": ("https://grpc.io/grpc/python/", None), } diff --git a/google/cloud/translate_v3/gapic/translation_service_client.py b/google/cloud/translate_v3/gapic/translation_service_client.py index 3852f06c..95f7e770 100644 --- a/google/cloud/translate_v3/gapic/translation_service_client.py +++ b/google/cloud/translate_v3/gapic/translation_service_client.py @@ -183,8 +183,12 @@ def __init__( ) self.transport = transport else: - self.transport = translation_service_grpc_transport.TranslationServiceGrpcTransport( - address=api_endpoint, channel=channel, credentials=credentials, + self.transport = ( + translation_service_grpc_transport.TranslationServiceGrpcTransport( + address=api_endpoint, + channel=channel, + credentials=credentials, + ) ) if client_info is None: @@ -444,7 +448,9 @@ def detect_language( # Sanity check: We have some fields which are mutually exclusive; # raise ValueError if more than one is sent. - google.api_core.protobuf_helpers.check_oneof(content=content,) + google.api_core.protobuf_helpers.check_oneof( + content=content, + ) request = translation_service_pb2.DetectLanguageRequest( parent=parent, @@ -553,7 +559,9 @@ def get_supported_languages( ) request = translation_service_pb2.GetSupportedLanguagesRequest( - parent=parent, display_language_code=display_language_code, model=model, + parent=parent, + display_language_code=display_language_code, + model=model, ) if metadata is None: metadata = [] @@ -811,7 +819,8 @@ def create_glossary( ) request = translation_service_pb2.CreateGlossaryRequest( - parent=parent, glossary=glossary, + parent=parent, + glossary=glossary, ) if metadata is None: metadata = [] @@ -914,7 +923,9 @@ def list_glossaries( ) request = translation_service_pb2.ListGlossariesRequest( - parent=parent, page_size=page_size, filter=filter_, + parent=parent, + page_size=page_size, + filter=filter_, ) if metadata is None: metadata = [] @@ -995,7 +1006,9 @@ def get_glossary( client_info=self._client_info, ) - request = translation_service_pb2.GetGlossaryRequest(name=name,) + request = translation_service_pb2.GetGlossaryRequest( + name=name, + ) if metadata is None: metadata = [] metadata = list(metadata) @@ -1074,7 +1087,9 @@ def delete_glossary( client_info=self._client_info, ) - request = translation_service_pb2.DeleteGlossaryRequest(name=name,) + request = translation_service_pb2.DeleteGlossaryRequest( + name=name, + ) if metadata is None: metadata = [] metadata = list(metadata) diff --git a/google/cloud/translate_v3/proto/translation_service_pb2.py b/google/cloud/translate_v3/proto/translation_service_pb2.py index 0f45c91a..11780204 100644 --- a/google/cloud/translate_v3/proto/translation_service_pb2.py +++ b/google/cloud/translate_v3/proto/translation_service_pb2.py @@ -511,7 +511,9 @@ ), ], extensions=[], - nested_types=[_TRANSLATETEXTREQUEST_LABELSENTRY,], + nested_types=[ + _TRANSLATETEXTREQUEST_LABELSENTRY, + ], enum_types=[], serialized_options=None, is_extendable=False, @@ -845,7 +847,9 @@ ), ], extensions=[], - nested_types=[_DETECTLANGUAGEREQUEST_LABELSENTRY,], + nested_types=[ + _DETECTLANGUAGEREQUEST_LABELSENTRY, + ], enum_types=[], serialized_options=None, is_extendable=False, @@ -1847,7 +1851,9 @@ ], extensions=[], nested_types=[], - enum_types=[_BATCHTRANSLATEMETADATA_STATE,], + enum_types=[ + _BATCHTRANSLATEMETADATA_STATE, + ], serialized_options=None, is_extendable=False, syntax="proto3", @@ -2267,7 +2273,10 @@ ), ], extensions=[], - nested_types=[_GLOSSARY_LANGUAGECODEPAIR, _GLOSSARY_LANGUAGECODESSET,], + nested_types=[ + _GLOSSARY_LANGUAGECODEPAIR, + _GLOSSARY_LANGUAGECODESSET, + ], enum_types=[], serialized_options=b"\352Ab\n!translate.googleapis.com/Glossary\022=projects/{project}/locations/{location}/glossaries/{glossary}", is_extendable=False, @@ -2656,7 +2665,9 @@ ], extensions=[], nested_types=[], - enum_types=[_CREATEGLOSSARYMETADATA_STATE,], + enum_types=[ + _CREATEGLOSSARYMETADATA_STATE, + ], serialized_options=None, is_extendable=False, syntax="proto3", @@ -2735,7 +2746,9 @@ ], extensions=[], nested_types=[], - enum_types=[_DELETEGLOSSARYMETADATA_STATE,], + enum_types=[ + _DELETEGLOSSARYMETADATA_STATE, + ], serialized_options=None, is_extendable=False, syntax="proto3", diff --git a/google/cloud/translate_v3/proto/translation_service_pb2_grpc.py b/google/cloud/translate_v3/proto/translation_service_pb2_grpc.py index 66b1b6cf..33f77ec8 100644 --- a/google/cloud/translate_v3/proto/translation_service_pb2_grpc.py +++ b/google/cloud/translate_v3/proto/translation_service_pb2_grpc.py @@ -71,22 +71,19 @@ class TranslationServiceServicer(object): """ def TranslateText(self, request, context): - """Translates input text and returns translated text. - """ + """Translates input text and returns translated text.""" context.set_code(grpc.StatusCode.UNIMPLEMENTED) context.set_details("Method not implemented!") raise NotImplementedError("Method not implemented!") def DetectLanguage(self, request, context): - """Detects the language of text within a request. - """ + """Detects the language of text within a request.""" context.set_code(grpc.StatusCode.UNIMPLEMENTED) context.set_details("Method not implemented!") raise NotImplementedError("Method not implemented!") def GetSupportedLanguages(self, request, context): - """Returns a list of supported languages for translation. - """ + """Returns a list of supported languages for translation.""" context.set_code(grpc.StatusCode.UNIMPLEMENTED) context.set_details("Method not implemented!") raise NotImplementedError("Method not implemented!") diff --git a/google/cloud/translate_v3beta1/gapic/translation_service_client.py b/google/cloud/translate_v3beta1/gapic/translation_service_client.py index 15668dfd..4689801d 100644 --- a/google/cloud/translate_v3beta1/gapic/translation_service_client.py +++ b/google/cloud/translate_v3beta1/gapic/translation_service_client.py @@ -183,8 +183,12 @@ def __init__( ) self.transport = transport else: - self.transport = translation_service_grpc_transport.TranslationServiceGrpcTransport( - address=api_endpoint, channel=channel, credentials=credentials, + self.transport = ( + translation_service_grpc_transport.TranslationServiceGrpcTransport( + address=api_endpoint, + channel=channel, + credentials=credentials, + ) ) if client_info is None: @@ -442,7 +446,9 @@ def detect_language( # Sanity check: We have some fields which are mutually exclusive; # raise ValueError if more than one is sent. - google.api_core.protobuf_helpers.check_oneof(content=content,) + google.api_core.protobuf_helpers.check_oneof( + content=content, + ) request = translation_service_pb2.DetectLanguageRequest( parent=parent, @@ -550,7 +556,9 @@ def get_supported_languages( ) request = translation_service_pb2.GetSupportedLanguagesRequest( - parent=parent, display_language_code=display_language_code, model=model, + parent=parent, + display_language_code=display_language_code, + model=model, ) if metadata is None: metadata = [] @@ -808,7 +816,8 @@ def create_glossary( ) request = translation_service_pb2.CreateGlossaryRequest( - parent=parent, glossary=glossary, + parent=parent, + glossary=glossary, ) if metadata is None: metadata = [] @@ -911,7 +920,9 @@ def list_glossaries( ) request = translation_service_pb2.ListGlossariesRequest( - parent=parent, page_size=page_size, filter=filter_, + parent=parent, + page_size=page_size, + filter=filter_, ) if metadata is None: metadata = [] @@ -992,7 +1003,9 @@ def get_glossary( client_info=self._client_info, ) - request = translation_service_pb2.GetGlossaryRequest(name=name,) + request = translation_service_pb2.GetGlossaryRequest( + name=name, + ) if metadata is None: metadata = [] metadata = list(metadata) @@ -1071,7 +1084,9 @@ def delete_glossary( client_info=self._client_info, ) - request = translation_service_pb2.DeleteGlossaryRequest(name=name,) + request = translation_service_pb2.DeleteGlossaryRequest( + name=name, + ) if metadata is None: metadata = [] metadata = list(metadata) diff --git a/google/cloud/translate_v3beta1/proto/translation_service_pb2.py b/google/cloud/translate_v3beta1/proto/translation_service_pb2.py index 8a3ddc38..38559782 100644 --- a/google/cloud/translate_v3beta1/proto/translation_service_pb2.py +++ b/google/cloud/translate_v3beta1/proto/translation_service_pb2.py @@ -511,7 +511,9 @@ ), ], extensions=[], - nested_types=[_TRANSLATETEXTREQUEST_LABELSENTRY,], + nested_types=[ + _TRANSLATETEXTREQUEST_LABELSENTRY, + ], enum_types=[], serialized_options=None, is_extendable=False, @@ -845,7 +847,9 @@ ), ], extensions=[], - nested_types=[_DETECTLANGUAGEREQUEST_LABELSENTRY,], + nested_types=[ + _DETECTLANGUAGEREQUEST_LABELSENTRY, + ], enum_types=[], serialized_options=None, is_extendable=False, @@ -1847,7 +1851,9 @@ ], extensions=[], nested_types=[], - enum_types=[_BATCHTRANSLATEMETADATA_STATE,], + enum_types=[ + _BATCHTRANSLATEMETADATA_STATE, + ], serialized_options=None, is_extendable=False, syntax="proto3", @@ -2267,7 +2273,10 @@ ), ], extensions=[], - nested_types=[_GLOSSARY_LANGUAGECODEPAIR, _GLOSSARY_LANGUAGECODESSET,], + nested_types=[ + _GLOSSARY_LANGUAGECODEPAIR, + _GLOSSARY_LANGUAGECODESSET, + ], enum_types=[], serialized_options=b"\352Ab\n!translate.googleapis.com/Glossary\022=projects/{project}/locations/{location}/glossaries/{glossary}", is_extendable=False, @@ -2656,7 +2665,9 @@ ], extensions=[], nested_types=[], - enum_types=[_CREATEGLOSSARYMETADATA_STATE,], + enum_types=[ + _CREATEGLOSSARYMETADATA_STATE, + ], serialized_options=None, is_extendable=False, syntax="proto3", @@ -2735,7 +2746,9 @@ ], extensions=[], nested_types=[], - enum_types=[_DELETEGLOSSARYMETADATA_STATE,], + enum_types=[ + _DELETEGLOSSARYMETADATA_STATE, + ], serialized_options=None, is_extendable=False, syntax="proto3", diff --git a/google/cloud/translate_v3beta1/proto/translation_service_pb2_grpc.py b/google/cloud/translate_v3beta1/proto/translation_service_pb2_grpc.py index 03a02437..709c2e12 100644 --- a/google/cloud/translate_v3beta1/proto/translation_service_pb2_grpc.py +++ b/google/cloud/translate_v3beta1/proto/translation_service_pb2_grpc.py @@ -71,22 +71,19 @@ class TranslationServiceServicer(object): """ def TranslateText(self, request, context): - """Translates input text and returns translated text. - """ + """Translates input text and returns translated text.""" context.set_code(grpc.StatusCode.UNIMPLEMENTED) context.set_details("Method not implemented!") raise NotImplementedError("Method not implemented!") def DetectLanguage(self, request, context): - """Detects the language of text within a request. - """ + """Detects the language of text within a request.""" context.set_code(grpc.StatusCode.UNIMPLEMENTED) context.set_details("Method not implemented!") raise NotImplementedError("Method not implemented!") def GetSupportedLanguages(self, request, context): - """Returns a list of supported languages for translation. - """ + """Returns a list of supported languages for translation.""" context.set_code(grpc.StatusCode.UNIMPLEMENTED) context.set_details("Method not implemented!") raise NotImplementedError("Method not implemented!") diff --git a/noxfile.py b/noxfile.py index 0e544dad..1de2a2cb 100644 --- a/noxfile.py +++ b/noxfile.py @@ -23,7 +23,7 @@ import nox -BLACK_VERSION = "black==19.10b0" +BLACK_VERSION = "black==22.3.0" BLACK_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] DEFAULT_PYTHON_VERSION = "3.8" @@ -43,7 +43,9 @@ def lint(session): """ session.install("flake8", BLACK_VERSION) session.run( - "black", "--check", *BLACK_PATHS, + "black", + "--check", + *BLACK_PATHS, ) session.run("flake8", "google", "tests") @@ -60,7 +62,8 @@ def blacken(session): """ session.install(BLACK_VERSION) session.run( - "black", *BLACK_PATHS, + "black", + *BLACK_PATHS, ) @@ -123,7 +126,9 @@ def system(session): # Install all test dependencies, then install this package into the # virtualenv's dist-packages. session.install( - "mock", "pytest", "google-cloud-testutils", + "mock", + "pytest", + "google-cloud-testutils", ) session.install("-e", "test_utils") session.install("-e", ".") diff --git a/tests/system.py b/tests/system.py index 975d3a22..3204a25a 100644 --- a/tests/system.py +++ b/tests/system.py @@ -46,7 +46,7 @@ def test_get_languages(self): self.assertEqual(lang_map["zu"], "Zulu") def test_detect_language(self): - values = ["takoy", u"fa\xe7ade", "s'il vous plait"] + values = ["takoy", "fa\xe7ade", "s'il vous plait"] detections = Config.CLIENT.detect_language(values) self.assertEqual(len(values), len(detections)) self.assertEqual(detections[0]["language"], "ru") @@ -61,16 +61,15 @@ def test_translate(self): self.assertEqual(len(values), len(translations)) self.assertEqual(translations[0]["detectedSourceLanguage"].lower(), "hr") - self.assertEqual(translations[0]["translatedText"].lower(), u"fünfzehn") + self.assertEqual(translations[0]["translatedText"].lower(), "fünfzehn") self.assertEqual(translations[1]["detectedSourceLanguage"], "eo") - self.assertEqual(translations[1]["translatedText"].lower(), u"fünfzehn") + self.assertEqual(translations[1]["translatedText"].lower(), "fünfzehn") self.assertEqual(translations[2]["detectedSourceLanguage"], "es") es_translation = translations[2]["translatedText"].lower() self.assertTrue( - es_translation == u"ich heiße jeff" - or es_translation == u"mein name ist jeff" + es_translation == "ich heiße jeff" or es_translation == "mein name ist jeff" ) self.assertEqual(translations[3]["detectedSourceLanguage"], "en") diff --git a/tests/unit/v2/test__http.py b/tests/unit/v2/test__http.py index 1ac16fa0..caadcfd8 100644 --- a/tests/unit/v2/test__http.py +++ b/tests/unit/v2/test__http.py @@ -28,30 +28,24 @@ def _make_one(self, *args, **kw): return self._get_target_class()(*args, **kw) def test_build_api_url_no_extra_query_params(self): - from six.moves.urllib.parse import parse_qsl - from six.moves.urllib.parse import urlsplit - conn = self._make_one(object()) - uri = conn.build_api_url("/foo") - scheme, netloc, path, qs, _ = urlsplit(uri) - self.assertEqual("%s://%s" % (scheme, netloc), conn.API_BASE_URL) - self.assertEqual( - path, "/".join(["", "language", "translate", conn.API_VERSION, "foo"]) + URI = "/".join( + [ + conn.DEFAULT_API_ENDPOINT, + "language", + "translate", + conn.API_VERSION, + "foo", + ] ) URI += "?prettyPrint=false" self.assertEqual(conn.build_api_url("/foo"), URI) def test_build_api_url_w_custom_endpoint(self): - from six.moves.urllib.parse import parse_qsl - from six.moves.urllib.parse import urlsplit - custom_endpoint = "https://foo-translation.googleapis.com" conn = self._make_one(object(), api_endpoint=custom_endpoint) - uri = conn.build_api_url("/foo") - scheme, netloc, path, qs, _ = urlsplit(uri) - self.assertEqual("%s://%s" % (scheme, netloc), custom_endpoint) - self.assertEqual( - path, "/".join(["", "language", "translate", conn.API_VERSION, "foo"]) + URI = "/".join( + [custom_endpoint, "language", "translate", conn.API_VERSION, "foo"] ) URI += "?prettyPrint=false" self.assertEqual(conn.build_api_url("/foo"), URI) diff --git a/tests/unit/v2/test_client.py b/tests/unit/v2/test_client.py index 2c0f72b1..211e06e1 100644 --- a/tests/unit/v2/test_client.py +++ b/tests/unit/v2/test_client.py @@ -199,7 +199,7 @@ def test_detect_language_single_value(self): def test_detect_language_multiple_values(self): client = self._make_one(_http=object()) - value1 = u"fa\xe7ade" # facade (with a cedilla) + value1 = "fa\xe7ade" # facade (with a cedilla) detection1 = { "confidence": 0.6166008, "input": value1,