Merge pull request #162 from proppy/fix-3.6

Fleker · web-flow · commit 69bc6854e334 · 2018-01-12T09:58:58.000-08:00
google-assistant-sdk/pushtotalk: fix import boilerplate for python3.6
diff --git a/google-assistant-sdk/googlesamples/assistant/grpc/pushtotalk.py b/google-assistant-sdk/googlesamples/assistant/grpc/pushtotalk.py
@@ -40,7 +40,7 @@
         audio_helpers,
         device_helpers
     )
-except SystemError:
+except (SystemError, ImportError):
     import assistant_helpers
     import audio_helpers
     import device_helpers
diff --git a/google-assistant-sdk/googlesamples/assistant/grpc/textinput.py b/google-assistant-sdk/googlesamples/assistant/grpc/textinput.py
@@ -32,7 +32,7 @@
     from . import (
         assistant_helpers,
     )
-except SystemError:
+except (SystemError, ImportError):
     import assistant_helpers
 
 

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@`
`40`	`40`	`audio_helpers,`
`41`	`41`	`device_helpers`
`42`	`42`	`)`
`43`		`-except SystemError:`
	`43`	`+except (SystemError, ImportError):`
`44`	`44`	`import assistant_helpers`
`45`	`45`	`import audio_helpers`
`46`	`46`	`import device_helpers`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@`
`32`	`32`	`from . import (`
`33`	`33`	`assistant_helpers,`
`34`	`34`	`)`
`35`		`-except SystemError:`
	`35`	`+except (SystemError, ImportError):`
`36`	`36`	`import assistant_helpers`
`37`	`37`
`38`	`38`