Skip to content

Commit ca20945

Browse files
authored
Update imports to be explicitly relative (#296)
In python 3, imports are absolute by default. By adding from __future__ import absolute_import, we ensure that python 2 adopts this behavior too.
1 parent 7975c0c commit ca20945

File tree

22 files changed

+52
-1
lines changed

22 files changed

+52
-1
lines changed

apitools/gen/extended_descriptor.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -416,6 +416,8 @@ def PrintPreamble(self, package, version, file_descriptor):
416416
self.__printer('# NOTE: This file is autogenerated and should not be '
417417
'edited by hand.')
418418
self.__printer()
419+
self.__printer('from __future__ import absolute_import')
420+
self.__printer()
419421
self.__PrintAdditionalImports(file_descriptor.additional_imports)
420422
self.__printer()
421423
self.__printer("package = '%s'", file_descriptor.package)

apitools/gen/gen_client_lib.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,12 +168,14 @@ def WriteInit(self, out):
168168
else:
169169
printer('"""Package marker file."""')
170170
printer()
171+
printer('from __future__ import absolute_import')
172+
printer()
171173
printer('import pkgutil')
172174
printer()
173175
if self.__init_wildcards_file:
174176
printer('from %s import *', self.__base_files_package)
175177
if self.__root_package == '.':
176-
import_prefix = ''
178+
import_prefix = '.'
177179
else:
178180
import_prefix = '%s.' % self.__root_package
179181
printer('from %s%s import *',

apitools/gen/gen_client_test.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,8 @@ def testGenClient_SimpleDocEmptyInit(self):
7373
init_file = _GetContent(os.path.join(tmp_dir_path, '__init__.py'))
7474
self.assertEqual("""\"""Package marker file.\"""
7575
76+
from __future__ import absolute_import
77+
7678
import pkgutil
7779
7880
__path__ = pkgutil.extend_path(__path__, __name__)

apitools/gen/service_registry.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,9 @@ def WriteFile(self, printer):
200200
client_info.package, client_info.version)
201201
printer('# NOTE: This file is autogenerated and should not be edited '
202202
'by hand.')
203+
printer()
204+
printer('from __future__ import absolute_import')
205+
printer()
203206
printer('from %s import base_api', self.__base_files_package)
204207
if self.__root_package:
205208
import_prefix = 'from {0} '.format(self.__root_package)
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
"""Package marker file."""
22

3+
from __future__ import absolute_import
4+
35
import pkgutil
46

57
__path__ = pkgutil.extend_path(__path__, __name__)

samples/bigquery_sample/bigquery_v2/bigquery_v2_client.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
"""Generated client library for bigquery version v2."""
22
# NOTE: This file is autogenerated and should not be edited by hand.
3+
4+
from __future__ import absolute_import
5+
36
from apitools.base.py import base_api
47
from samples.bigquery_sample.bigquery_v2 import bigquery_v2_messages as messages
58

samples/bigquery_sample/bigquery_v2/bigquery_v2_messages.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
"""
55
# NOTE: This file is autogenerated and should not be edited by hand.
66

7+
from __future__ import absolute_import
8+
79
from apitools.base.protorpclite import messages as _messages
810
from apitools.base.py import encoding
911
from apitools.base.py import extra_types
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
"""Package marker file."""
22

3+
from __future__ import absolute_import
4+
35
import pkgutil
46

57
__path__ = pkgutil.extend_path(__path__, __name__)

samples/dns_sample/dns_v1/dns_v1_client.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
"""Generated client library for dns version v1."""
22
# NOTE: This file is autogenerated and should not be edited by hand.
3+
4+
from __future__ import absolute_import
5+
36
from apitools.base.py import base_api
47
from samples.dns_sample.dns_v1 import dns_v1_messages as messages
58

samples/dns_sample/dns_v1/dns_v1_messages.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
"""
66
# NOTE: This file is autogenerated and should not be edited by hand.
77

8+
from __future__ import absolute_import
9+
810
from apitools.base.protorpclite import messages as _messages
911

1012

0 commit comments

Comments
 (0)