Merge topic 'fix-use-of-argparse-fallback'

5590b0d Move VTK to get addition of _argparse.py to vtk.util package.
5c12b86 Fix how we import our argparse fallback implementation.

Author: utkarshayachit

VTK

@@ -56,7 +56,7 @@
 except ImportError:
     # since  Python 2.6 and earlier don't have argparse, we simply provide
     # the source for the same as _argparse and we use it instead.
-    import _argparse as argparse
+    from vtk.util import _argparse as argparse
 
 # =============================================================================
 # Create custom Data Prober class to handle clients requests

Web/Applications/DataProber/server/pv_web_data_prober.py

@@ -64,7 +64,7 @@
 except ImportError:
     # since  Python 2.6 and earlier don't have argparse, we simply provide
     # the source for the same as _argparse and we use it instead.
-    import _argparse as argparse
+    from vtk.util import _argparse as argparse
 
 # =============================================================================
 # Create custom File Opener class to handle clients requests

Web/Applications/FileViewer/server/pv_web_file_loader.py

@@ -44,7 +44,7 @@
 except ImportError:
     # since  Python 2.6 and earlier don't have argparse, we simply provide
     # the source for the same as _argparse and we use it instead.
-    import _argparse as argparse
+    from vtk.util import _argparse as argparse
 
 # =============================================================================
 # Create custom class to handle clients requests

Web/Applications/TestApp/server/pv_web_test_app.py

@@ -96,7 +96,7 @@
 except ImportError:
     # since  Python 2.6 and earlier don't have argparse, we simply provide
     # the source for the same as _argparse and we use it instead.
-    import _argparse as argparse
+    from vtk.util import _argparse as argparse
 
 # =============================================================================
 # Create custom Pipeline Manager class to handle clients requests