Imported Debian patch 4.0.5-6~numeezy

ipatests/ipa-test-config

@@ -19,15 +19,13 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import print_function
-
 import sys
 import os
 import argparse
 import json
 
 from ipalib.constants import FQDN
-from ipatests.test_integration import config, env_config
+from ipatests.test_integration import config
 
 
 def main(argv):
@@ -94,8 +92,7 @@ def main(argv):
         import yaml
         return yaml.safe_dump(conf.to_dict(), default_flow_style=False)
     else:
-        env = get_object(conf, args).to_env(**kwargs)
-        return env_config.env_to_script(env)
+        return config.env_to_script(get_object(conf, args).to_env(**kwargs))
 
 
 def get_object(conf, args):
@@ -156,4 +153,4 @@ def get_object(conf, args):
 
 
 if __name__ == '__main__':
-    print(main(sys.argv[1:]), end=' ')
+    print main(sys.argv[1:]),