summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSorin Sbarnea <ssbarnea@redhat.com>2018-10-27 12:48:38 +0100
committerSorin Sbarnea <ssbarnea@redhat.com>2018-10-27 12:49:53 +0100
commitb7f4d86bb9fe739f9da0b91d7fc72510a5c75af0 (patch)
tree8e88106e4f1c3ef4f2eef70d610e5b67a9284b07
parent93ddc0247d02c118c60abe0166cd5a338c28d956 (diff)
Makes queue import cross py2/py3 compatible
See http://logs.openstack.org/26/613726/2/check/tox-py27/c389283/job-output.txt.gz Change-Id: I1f1fc7b9393cfa44cfb3ba06ee06185fc7569d3a
Notes
Notes (review): Code-Review+2: Clark Boylan <cboylan@sapwetik.org> Code-Review+1: Chandan Kumar <chkumar@redhat.com> Code-Review+2: Andreas Jaeger <jaegerandi@gmail.com> Workflow+1: Andreas Jaeger <jaegerandi@gmail.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Sat, 27 Oct 2018 13:38:16 +0000 Reviewed-on: https://review.openstack.org/613728 Project: openstack-infra/zuul-jobs Branch: refs/heads/master
-rwxr-xr-xroles/upload-logs-swift/library/zuul_swift_upload.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/roles/upload-logs-swift/library/zuul_swift_upload.py b/roles/upload-logs-swift/library/zuul_swift_upload.py
index 5c1ca25..00522e9 100755
--- a/roles/upload-logs-swift/library/zuul_swift_upload.py
+++ b/roles/upload-logs-swift/library/zuul_swift_upload.py
@@ -28,7 +28,10 @@ import argparse
28import logging 28import logging
29import mimetypes 29import mimetypes
30import os 30import os
31import queue as queuelib 31try:
32 import queue as queuelib
33except ImportError:
34 import Queue as queuelib
32import stat 35import stat
33import sys 36import sys
34import tempfile 37import tempfile