Fixes broken build by moving __future__ imports to top

shidarin · Apr 24, 2014 · ad44719 · ad44719
1 parent 7e72007
commit ad44719
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/cdl_convert.py b/cdl_convert.py
@@ -93,6 +93,8 @@
 # IMPORTS
 # ==============================================================================
 
+from __future__ import print_function
+
 from argparse import ArgumentParser
 from ast import literal_eval
 import os
@@ -109,8 +111,6 @@
 except NameError:  # pragma: no cover
     raw_input = input  # pylint: disable=W0622, C0103
 
-from __future__ import print_function
-
 # ==============================================================================
 # GLOBALS
 # ==============================================================================

diff --git a/tests/test_cdl_convert.py b/tests/test_cdl_convert.py
@@ -21,6 +21,10 @@
     import mock
 import os
 from random import choice, random, randrange
+try:
+    from StringIO import StringIO
+except ImportError:
+    from io import StringIO
 import sys
 import tempfile
 import unittest
@@ -1918,13 +1922,16 @@ def setUp(self):
         self.inputFormats = cdl_convert.INPUT_FORMATS
         self.outputFormats = cdl_convert.OUTPUT_FORMATS
         self.sysargv = sys.argv
+        self.stdout = sys.stdout
+        sys.stdout = StringIO()
 
     #===========================================================================
 
     def tearDown(self):
         cdl_convert.INPUT_FORMATS = self.inputFormats
         cdl_convert.OUTPUT_FORMATS = self.outputFormats
         sys.argv = self.sysargv
+        sys.stdout = self.stdout
 
     #===========================================================================
     # TESTS