Code Clean up

Author: rahur-NI

build/templates/_grpc_stub_interpreter.py.mako

@@ -13,6 +13,7 @@ are_complex_parameters_used = helper.are_complex_parameters_used(functions)
 
 import grpc
 import hightime  # noqa: F401
+import session_pb2 as session_grpc_types
 import threading
 import warnings
 
@@ -25,7 +26,6 @@ from . import nidevice_pb2 as grpc_complex_types  # noqa: F401
 % endif
 from . import ${proto_name}_pb2 as grpc_types
 from . import ${proto_name}_pb2_grpc as ${module_name}_grpc
-import session_pb2 as session_grpc_types
 % for c in config['custom_types']:
 
 from . import ${c['file_name']} as ${c['file_name']}  # noqa: F401

generated/nidcpower/nidcpower/_grpc_stub_interpreter.py

@@ -3,14 +3,14 @@
 
 import grpc
 import hightime  # noqa: F401
+import session_pb2 as session_grpc_types
 import threading
 import warnings
 
 from . import enums as enums  # noqa: F401
 from . import errors as errors
 from . import nidcpower_pb2 as grpc_types
 from . import nidcpower_pb2_grpc as nidcpower_grpc
-import session_pb2 as session_grpc_types
 
 from . import lcr_measurement as lcr_measurement  # noqa: F401
 

generated/nidigital/nidigital/_grpc_stub_interpreter.py

@@ -3,14 +3,14 @@
 
 import grpc
 import hightime  # noqa: F401
+import session_pb2 as session_grpc_types
 import threading
 import warnings
 
 from . import enums as enums  # noqa: F401
 from . import errors as errors
 from . import nidigitalpattern_pb2 as grpc_types
 from . import nidigitalpattern_pb2_grpc as nidigital_grpc
-import session_pb2 as session_grpc_types
 
 from . import history_ram_cycle_information as history_ram_cycle_information  # noqa: F401
 

generated/nidmm/nidmm/_grpc_stub_interpreter.py

@@ -3,14 +3,14 @@
 
 import grpc
 import hightime  # noqa: F401
+import session_pb2 as session_grpc_types
 import threading
 import warnings
 
 from . import enums as enums  # noqa: F401
 from . import errors as errors
 from . import nidmm_pb2 as grpc_types
 from . import nidmm_pb2_grpc as nidmm_grpc
-import session_pb2 as session_grpc_types
 
 
 class GrpcStubInterpreter(object):

generated/nifake/nifake/_grpc_stub_interpreter.py

@@ -3,6 +3,7 @@
 
 import grpc
 import hightime  # noqa: F401
+import session_pb2 as session_grpc_types
 import threading
 import warnings
 
@@ -11,7 +12,6 @@
 from . import nidevice_pb2 as grpc_complex_types  # noqa: F401
 from . import nifake_pb2 as grpc_types
 from . import nifake_pb2_grpc as nifake_grpc
-import session_pb2 as session_grpc_types
 
 from . import custom_struct as custom_struct  # noqa: F401
 

generated/nifake/nifake/unit_tests/test_grpc.py

@@ -6,13 +6,13 @@
 import nifake.errors
 import numpy
 import pytest
+import session_pb2
 import warnings
 
 from unittest.mock import MagicMock
 from unittest.mock import patch
 
 import _mock_helper
-import session_pb2
 
 GRPC_SESSION_OBJECT_FOR_TEST = session_pb2.Session(name="TestSession")
 
@@ -86,7 +86,6 @@ def _get_initialized_stub_interpreter(self, grpc_channel=object()):
         session_options = nifake.GrpcSessionOptions(grpc_channel, '', initialization_behavior=nifake.SessionInitializationBehavior.AUTO)
         interpreter = nifake._grpc_stub_interpreter.GrpcStubInterpreter(session_options)
         assert interpreter._client is self.patched_grpc_stub
-        assert interpreter.get_session_handle().id == 0
         assert interpreter.get_session_handle().name == ""
         assert self.patched_grpc_stub._grpc_channel is grpc_channel
         interpreter.set_session_handle(GRPC_SESSION_OBJECT_FOR_TEST)

generated/nifgen/nifgen/_grpc_stub_interpreter.py

@@ -3,14 +3,14 @@
 
 import grpc
 import hightime  # noqa: F401
+import session_pb2 as session_grpc_types
 import threading
 import warnings
 
 from . import enums as enums  # noqa: F401
 from . import errors as errors
 from . import nifgen_pb2 as grpc_types
 from . import nifgen_pb2_grpc as nifgen_grpc
-import session_pb2 as session_grpc_types
 
 
 class GrpcStubInterpreter(object):

generated/nirfsg/nirfsg/_grpc_stub_interpreter.py

@@ -3,6 +3,7 @@
 
 import grpc
 import hightime  # noqa: F401
+import session_pb2 as session_grpc_types
 import threading
 import warnings
 
@@ -11,7 +12,6 @@
 from . import nidevice_pb2 as grpc_complex_types  # noqa: F401
 from . import nirfsg_pb2 as grpc_types
 from . import nirfsg_pb2_grpc as nirfsg_grpc
-import session_pb2 as session_grpc_types
 
 
 class GrpcStubInterpreter(object):

generated/niscope/niscope/_grpc_stub_interpreter.py

@@ -3,14 +3,14 @@
 
 import grpc
 import hightime  # noqa: F401
+import session_pb2 as session_grpc_types
 import threading
 import warnings
 
 from . import enums as enums  # noqa: F401
 from . import errors as errors
 from . import niscope_pb2 as grpc_types
 from . import niscope_pb2_grpc as niscope_grpc
-import session_pb2 as session_grpc_types
 
 from . import waveform_info as waveform_info  # noqa: F401
 

generated/niswitch/niswitch/_grpc_stub_interpreter.py

@@ -3,14 +3,14 @@
 
 import grpc
 import hightime  # noqa: F401
+import session_pb2 as session_grpc_types
 import threading
 import warnings
 
 from . import enums as enums  # noqa: F401
 from . import errors as errors
 from . import niswitch_pb2 as grpc_types
 from . import niswitch_pb2_grpc as niswitch_grpc
-import session_pb2 as session_grpc_types
 
 
 class GrpcStubInterpreter(object):