Fix linting errors

galaxyproject · Sep 21, 2015 · 975fdde · 975fdde
1 parent 97ad53f
commit 975fdde
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 16 deletions.
diff --git a/lib/galaxy/datatypes/binary.py b/lib/galaxy/datatypes/binary.py
@@ -8,7 +8,6 @@
 import struct
 import subprocess
 import tempfile
-import warnings
 import zipfile
 
 from bx.seq.twobit import TWOBIT_MAGIC_NUMBER, TWOBIT_MAGIC_NUMBER_SWAP, TWOBIT_MAGIC_SIZE

diff --git a/lib/galaxy/datatypes/converters/vcf_to_vcf_bgzip.py b/lib/galaxy/datatypes/converters/vcf_to_vcf_bgzip.py
@@ -7,7 +7,6 @@
 
 usage: %prog in_file out_file
 """
-import pkg_resources
 import ctabix
 import optparse
 

diff --git a/lib/galaxy/model/orm/scripts.py b/lib/galaxy/model/orm/scripts.py
@@ -6,7 +6,6 @@
 
 from galaxy.util.properties import load_app_properties
 
-import pkg_resources
 
 log = logging.getLogger( __name__ )
 

diff --git a/lib/galaxy/queue_worker.py b/lib/galaxy/queue_worker.py
@@ -5,7 +5,6 @@
 
 import logging
 import threading
-import sys
 
 import galaxy.queues
 from galaxy import util

diff --git a/lib/galaxy/queues.py b/lib/galaxy/queues.py
@@ -4,8 +4,6 @@
 
 """
 
-import sys
-
 from galaxy.config import process_is_uwsgi
 
 from kombu import Exchange, Queue, Connection

diff --git a/lib/galaxy/wheels.py b/lib/galaxy/wheels.py
@@ -30,14 +30,14 @@ def check( self, name ):
                 return True
         else:
             try:
-                return { "psycopg2":        lambda: self.config.get( "app:main", "database_connection" ).startswith( "postgres" ),
-                         "MySQL_python":    lambda: self.config.get( "app:main", "database_connection" ).startswith( "mysql://" ),
-                         "DRMAA_python":    lambda: "sge" in self.config.get( "app:main", "start_job_runners" ).split(","),
-                         "drmaa":           lambda: "drmaa" in self.config.get( "app:main", "start_job_runners" ).split(","),
-                         "pbs_python":      lambda: "pbs" in self.config.get( "app:main", "start_job_runners" ).split(","),
-                         "python_openid":   lambda: self.config.get( "app:main", "enable_openid" ),
-                         "python_daemon":   lambda: sys.version_info[:2] >= ( 2, 5 ),
-                         "PyRods":          lambda: self.config.get( "app:main", "object_store" ) == "irods"
+                return { "psycopg2": lambda: self.config.get( "app:main", "database_connection" ).startswith( "postgres" ),
+                         "MySQL_python": lambda: self.config.get( "app:main", "database_connection" ).startswith( "mysql://" ),
+                         "DRMAA_python": lambda: "sge" in self.config.get( "app:main", "start_job_runners" ).split(","),
+                         "drmaa": lambda: "drmaa" in self.config.get( "app:main", "start_job_runners" ).split(","),
+                         "pbs_python": lambda: "pbs" in self.config.get( "app:main", "start_job_runners" ).split(","),
+                         "python_openid": lambda: self.config.get( "app:main", "enable_openid" ),
+                         "python_daemon": lambda: sys.version_info[:2] >= ( 2, 5 ),
+                         "PyRods": lambda: self.config.get( "app:main", "object_store" ) == "irods"
                          }.get( name, lambda: True )()
             except:
                 return False

diff --git a/lib/pulsar/client/transport/poster.py b/lib/pulsar/client/transport/poster.py
@@ -11,7 +11,12 @@
 except ImportError:
     from urllib.request import Request
 
-import poster
+try:
+    import poster
+except ImportError:
+    poster = None
+
+POSTER_UNAVAILABLE_MESSAGE = "Pulsar configured to use poster module - but it is unavailable. Please install poster."
 
 log = logging.getLogger(__name__)
 
@@ -21,6 +26,7 @@
 
 
 def post_file(url, path):
+    __ensure_poster()
     try:
         datagen, headers = poster.encode.multipart_encode({"file": open(path, "rb")})
         request = Request(url, datagen, headers)
@@ -40,3 +46,8 @@ def get_file(url, path):
             if not buffer:
                 break
             output.write(buffer)
+
+
+def __ensure_poster():
+    if poster is None:
+        raise ImportError(POSTER_UNAVAILABLE_MESSAGE)
diff --git a/lib/pulsar/client/transport/requests.py b/lib/pulsar/client/transport/requests.py
@@ -2,7 +2,10 @@
 
 import logging
 
-import requests
+try:
+    import requests
+except ImportError:
+    requests = None
 
 try:
     import requests_toolbelt
@@ -12,6 +15,7 @@
     requests_toolbelt = None
 
 
+REQUESTS_UNAVAILABLE_MESSAGE = "Pulsar configured to use requests module - but it is unavailable. Please install requests."
 REQUESTS_TOOLBELT_UNAVAILABLE_MESSAGE = "Pulsar configured to use requests_toolbelt module - but it is unavailable. Please install requests_toolbelt."
 
 log = logging.getLogger(__name__)
@@ -21,6 +25,7 @@ def post_file(url, path):
     if requests_toolbelt is None:
         raise ImportError(REQUESTS_TOOLBELT_UNAVAILABLE_MESSAGE)
 
+    __ensure_requests()
     m = requests_toolbelt.MultipartEncoder(
         fields={'file': ('filename', open(path, 'rb'))}
     )
@@ -35,3 +40,8 @@ def get_file(url, path):
             if chunk:  # filter out keep-alive new chunks
                 f.write(chunk)
                 f.flush()
+
+
+def __ensure_requests():
+    if requests is None:
+        raise ImportError(REQUESTS_UNAVAILABLE_MESSAGE)