From 5f36250e6cbd37892b5f33bd745dd298cf2510b4 Mon Sep 17 00:00:00 2001
From: Andrei Stepanov <astepano@redhat.com>
Date: Nov 01 2018 11:01:22 +0000
Subject: Merge #265 `standard-inventory-docker: port to python3`


---

diff --git a/inventory/standard-inventory-docker b/inventory/standard-inventory-docker
index 466bcfd..10d75ba 100755
--- a/inventory/standard-inventory-docker
+++ b/inventory/standard-inventory-docker
@@ -1,26 +1,6 @@
-#!/usr/bin/python2
-
-# The MIT License (MIT)
-#
+#!/usr/bin/python3
+# SPDX Licence identifier MIT
 # Copyright (c) 2017-2018 Red Hat Inc.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy of
-# this software and associated documentation files (the "Software"), to deal in
-# the Software without restriction, including without limitation the rights to
-# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-# the Software, and to permit persons to whom the Software is furnished to do so,
-# subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
 # Author: Merlin Mathesius <merlinm@redhat.com>
 
 import argparse
@@ -173,7 +153,7 @@ def inv_host(subject, docker_extra_args):
         name = f.read().strip()
 
     # Need to figure out what python interpreter to use
-    interpreters = ["/usr/bin/python2", "/usr/bin/python3"]
+    interpreters = ["/usr/bin/python3", "/usr/bin/python2"]
     for interpreter in interpreters:
         check_file = ["/usr/bin/docker", "exec", "--user=root", name, "/usr/bin/ls", interpreter]
         try:
@@ -228,6 +208,7 @@ def inv_host(subject, docker_extra_args):
     if diagnose:
         def _signal_handler(*args):
             logger.info("Diagnose ending.")
+
         logger.info("kill {0} # when finished".format(os.getpid()))
         signal.signal(signal.SIGTERM, _signal_handler)
         signal.pause()