From 9fa9d42c5093ddd8f70193cc6a07ae0af0394f8c Mon Sep 17 00:00:00 2001
From: Nate Coraor <nate@bx.psu.edu>
Date: Fri, 13 Oct 2017 12:19:25 -0400
Subject: [PATCH] Fix backport issues

---
 lib/galaxy/datatypes/tabular.py                             | 1 +
 lib/galaxy/jobs/deferred/pacific_biosciences_smrt_portal.py | 1 -
 lib/galaxy/jobs/runners/util/kill.py                        | 1 -
 lib/galaxy/tools/imp_exp/unpack_tar_gz_archive.py           | 1 -
 lib/galaxy/web/proxy/__init__.py                            | 2 +-
 lib/tool_shed/capsule/capsule_manager.py                    | 1 -
 6 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/lib/galaxy/datatypes/tabular.py b/lib/galaxy/datatypes/tabular.py
index 16990df6c9b2..821f3d27be7a 100644
--- a/lib/galaxy/datatypes/tabular.py
+++ b/lib/galaxy/datatypes/tabular.py
@@ -8,6 +8,7 @@
 import logging
 import os
 import re
+import shutil
 import subprocess
 import tempfile
 from cgi import escape
diff --git a/lib/galaxy/jobs/deferred/pacific_biosciences_smrt_portal.py b/lib/galaxy/jobs/deferred/pacific_biosciences_smrt_portal.py
index 099227388192..bd458c061504 100644
--- a/lib/galaxy/jobs/deferred/pacific_biosciences_smrt_portal.py
+++ b/lib/galaxy/jobs/deferred/pacific_biosciences_smrt_portal.py
@@ -3,7 +3,6 @@
 produced by SMRT Portal.
 """
 import logging
-import urllib2
 from string import Template
 
 import requests
diff --git a/lib/galaxy/jobs/runners/util/kill.py b/lib/galaxy/jobs/runners/util/kill.py
index e12343c05362..4abce160eb2e 100644
--- a/lib/galaxy/jobs/runners/util/kill.py
+++ b/lib/galaxy/jobs/runners/util/kill.py
@@ -2,7 +2,6 @@
 import subprocess
 from platform import system
 from time import sleep
-from subprocess import Popen
 
 try:
     from psutil import Process, NoSuchProcess
diff --git a/lib/galaxy/tools/imp_exp/unpack_tar_gz_archive.py b/lib/galaxy/tools/imp_exp/unpack_tar_gz_archive.py
index f1318644ed88..46e12d837566 100644
--- a/lib/galaxy/tools/imp_exp/unpack_tar_gz_archive.py
+++ b/lib/galaxy/tools/imp_exp/unpack_tar_gz_archive.py
@@ -11,7 +11,6 @@
 import optparse
 import tarfile
 import tempfile
-import urllib2
 import math
 from base64 import b64decode
 
diff --git a/lib/galaxy/web/proxy/__init__.py b/lib/galaxy/web/proxy/__init__.py
index 85711dd75d2d..bd8f3a062f4e 100644
--- a/lib/galaxy/web/proxy/__init__.py
+++ b/lib/galaxy/web/proxy/__init__.py
@@ -254,6 +254,6 @@ def handle_requests(self, authentication, proxy_requests, route_name, container_
                 excp = "Could not contact proxy after %s seconds" % sum(range(sleep + 1))
                 raise Exception(excp)
             time.sleep(sleep)
-            self.handle_requests(authentication, proxy_requests, route_name, container_ids, container_interface, sleep=sleep + 1)
+            self.handle_requests(authentication, proxy_requests, route_name, container_ids, sleep=sleep + 1)
 
 # TODO: MQ diven proxy?
diff --git a/lib/tool_shed/capsule/capsule_manager.py b/lib/tool_shed/capsule/capsule_manager.py
index 1e92efa84f03..c150005f4da0 100644
--- a/lib/tool_shed/capsule/capsule_manager.py
+++ b/lib/tool_shed/capsule/capsule_manager.py
@@ -5,7 +5,6 @@
 import tarfile
 import tempfile
 import threading
-import urllib
 from time import gmtime
 from time import strftime