Skip to content
Permalink
Browse files
fix: replace unsafe six.PY3 with PY2 for better future compatibility …
…with Python 4 (#10081)

* fix: fix for Python 4: replace unsafe six.PY3 with PY2

* Fix wording
  • Loading branch information
hugovk authored and plamut committed Jan 15, 2020
1 parent 6596c4b commit 975c1ac2cfdac0ce4403c0b56ad19f2ee7241f1a
Showing with 3 additions and 3 deletions.
  1. +3 −3 synth.py
@@ -127,10 +127,10 @@
"google/cloud/pubsub_v1/gapic/publisher_client.py",
"class PublisherClient",
"""# TODO: remove conditional import after Python 2 support is dropped
if six.PY3:
from collections.abc import Mapping
else:
if six.PY2:
from collections import Mapping
else:
from collections.abc import Mapping
def _merge_dict(d1, d2):

0 comments on commit 975c1ac

Please sign in to comment.