Remove Python <=3.5 code

Using `ack --type=python -f | xargs pyupgrade --py3-plus`

Also:
- Remove dependency on `six`

Author: nsoranzo

dev-requirements.txt

@@ -19,7 +19,6 @@ flake8
 mypy
 types-paramiko
 types-pkg-resources
-types-six
 types-PyYAML
 types-pycurl
 types-requests

docker/coexecutor/Dockerfile

@@ -24,7 +24,7 @@ RUN apt-get update \
  # Install Pulsar Python requirements
     && pip install --no-cache-dir -U pip \
     && pip install --no-cache-dir drmaa wheel kombu pykube pycurl \
-            webob psutil PasteDeploy six pyyaml paramiko \
+            webob psutil PasteDeploy pyyaml paramiko \
  # Remove build deps and cleanup
     && apt-get -y remove gcc wget lsb-release \
     && apt-get -y autoremove \

docs/conf.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # Pulsar documentation build configuration file, created by
 # sphinx-quickstart on Sun Dec 16 23:16:23 2012.
@@ -42,8 +41,8 @@
 master_doc = 'index'
 
 # General information about the project.
-project = u'Pulsar'
-copyright = u'2014, Galaxy Project'
+project = 'Pulsar'
+copyright = '2014, Galaxy Project'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -185,8 +184,8 @@
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-  ('index', 'Pulsar.tex', u'Pulsar Documentation',
- u'The Galaxy Project', 'manual'),
+  ('index', 'Pulsar.tex', 'Pulsar Documentation',
+ 'The Galaxy Project', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -215,8 +214,8 @@
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    ('index', 'pulsar', u'Pulsar Documentation',
-     [u'Galaxy Project'], 1)
+    ('index', 'pulsar', 'Pulsar Documentation',
+     ['Galaxy Project'], 1)
 ]
 
 # If true, show URL addresses after external links.
@@ -229,8 +228,8 @@
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-  ('index', 'Pulsar', u'Pulsar Documentation',
- u'Galaxy Project', 'Pulsar', 'One line description of project.',
+  ('index', 'Pulsar', 'Pulsar Documentation',
+ 'Galaxy Project', 'Pulsar', 'One line description of project.',
  'Miscellaneous'),
 ]
 

pulsar/__init__.py

@@ -1,13 +1,11 @@
-# -*- coding: utf-8 -*-
-
 __version__ = '0.15.0.dev0'
 
 PROJECT_NAME = "pulsar"
 PROJECT_OWNER = PROJECT_USERAME = "galaxyproject"
 PROJECT_AUTHOR = 'Galaxy Project and Community'
 PROJECT_EMAIL = 'jmchilton@gmail.com'
 
-PROJECT_URL = "https://github.com/%s/%s" % (PROJECT_OWNER, PROJECT_NAME)
-RAW_CONTENT_URL = "https://raw.github.com/%s/%s/master/" % (
+PROJECT_URL = "https://github.com/{}/{}".format(PROJECT_OWNER, PROJECT_NAME)
+RAW_CONTENT_URL = "https://raw.github.com/{}/{}/master/".format(
  PROJECT_USERAME, PROJECT_NAME
 )

pulsar/cache/__init__.py

@@ -1,4 +1,3 @@
-
 from hashlib import sha256
 from os.path import exists, join
 
@@ -7,7 +6,7 @@
 from .util import Time
 
 
-class CacheFileMapper(object):
+class CacheFileMapper:
 
  def __init__(self, directory):
  self.directory = directory
@@ -22,7 +21,7 @@ class Cache(PersistenceStore):
     """
 
  def __init__(self, cache_directory="file_cache"):
- super(Cache, self).__init__(join(cache_directory, "cache_shelf"))
+ super().__init__(join(cache_directory, "cache_shelf"))
  self.file_mapper = CacheFileMapper(cache_directory)
  self.time = Time
 
@@ -58,7 +57,7 @@ def __destination(self, ip, path):
  return self.destination(token)
 
  def __token(self, ip, path):
- for_hash = "IP:%s:%s" % (ip, path)
+ for_hash = "IP:{}:{}".format(ip, path)
  return sha256(for_hash.encode('UTF-8')).hexdigest()
 
 

pulsar/cache/persistence.py

@@ -1,11 +1,10 @@
-
 import shelve
 import traceback
 
 from threading import Lock
 
 
-class PersistenceStore(object):
+class PersistenceStore:
 
  def __init__(self, filename, require_sync=True):
  self.shelf_filename = filename

pulsar/cache/util.py

@@ -1,4 +1,3 @@
-
 import os
 import shutil
 
@@ -22,7 +21,7 @@ def atomicish_move(source, destination, tmp_suffix="_TMP"):
     """
  destination_dir = os.path.dirname(destination)
  destination_name = os.path.basename(destination)
- temp_destination = os.path.join(destination_dir, "%s%s" % (destination_name, tmp_suffix))
+ temp_destination = os.path.join(destination_dir, "{}{}".format(destination_name, tmp_suffix))
  shutil.move(source, temp_destination)
  os.rename(temp_destination, destination)
 

pulsar/client/action_mapper.py

@@ -86,7 +86,7 @@
 MISSING_SSH_KEY_ERROR = "Attempt to use file transfer action requiring an SSH key without specifying a ssh_key."
 
 
-class FileActionMapper(object):
+class FileActionMapper:
  """
     Objects of this class define how paths are mapped to actions.
 
@@ -263,7 +263,7 @@ def __inject_url(self, action, file_type):
  if "?" not in url_base:
  url_base = "%s?" % url_base
  # TODO: URL encode path.
- url = "%s&path=%s&file_type=%s" % (url_base, action.path, file_type)
+ url = "{}&path={}&file_type={}".format(url_base, action.path, file_type)
  action.url = url
 
  def __inject_ssh_properties(self, action):
@@ -281,7 +281,7 @@ def __inject_ssh_properties(self, action):
 UNSET_ACTION_KWD = "__UNSET__"
 
 
-class BaseAction(object):
+class BaseAction:
  whole_directory_transfer_supported = False
  action_spec: Dict[str, Any] = {}
  action_type: str
@@ -341,7 +341,7 @@ def __str__(self):
  first = False
  else:
  attribute_str += ","
- attribute_str += "%s=%s" % (key, value)
+ attribute_str += "{}={}".format(key, value)
  return "FileAction[%s]" % attribute_str
 
 
@@ -376,7 +376,7 @@ class RewriteAction(BaseAction):
  staging = STAGING_ACTION_NONE
 
  def __init__(self, source, file_lister=None, source_directory=None, destination_directory=None):
- super(RewriteAction, self).__init__(source, file_lister=file_lister)
+ super().__init__(source, file_lister=file_lister)
  self.source_directory = source_directory
  self.destination_directory = destination_directory
 
@@ -453,7 +453,7 @@ class RemoteTransferAction(BaseAction):
  staging = STAGING_ACTION_REMOTE
 
  def __init__(self, source, file_lister=None, url=None):
- super(RemoteTransferAction, self).__init__(source, file_lister=file_lister)
+ super().__init__(source, file_lister=file_lister)
  self.url = url
 
  def to_dict(self):
@@ -511,7 +511,7 @@ class PubkeyAuthenticatedTransferAction(BaseAction):
 
  def __init__(self, source, file_lister=None, ssh_user=UNSET_ACTION_KWD,
  ssh_host=UNSET_ACTION_KWD, ssh_port=UNSET_ACTION_KWD, ssh_key=UNSET_ACTION_KWD):
- super(PubkeyAuthenticatedTransferAction, self).__init__(source, file_lister=file_lister)
+ super().__init__(source, file_lister=file_lister)
  self.ssh_user = ssh_user
  self.ssh_host = ssh_host
  self.ssh_port = ssh_port
@@ -587,7 +587,7 @@ def write_from_path(self, pulsar_path):
  self.ssh_port, key_file)
 
 
-class MessageAction(object):
+class MessageAction:
  """ Sort of pseudo action describing "files" store in memory and
     transferred via message (HTTP, Python-call, MQ, etc...)
     """
@@ -649,7 +649,7 @@ def from_dict(action_dict):
  return target_class.from_dict(action_dict)
 
 
-class BasePathMapper(object):
+class BasePathMapper:
  match_type: str
 
  def __init__(self, config):
@@ -697,7 +697,7 @@ class PathTypeOnlyMapper(BasePathMapper):
  match_type = 'path_type_only'
 
  def __init__(self, config):
- super(PathTypeOnlyMapper, self).__init__(config)
+ super().__init__(config)
 
  def _path_matches(self, path):
  return True
@@ -710,14 +710,14 @@ class PrefixPathMapper(BasePathMapper):
  match_type = 'prefix'
 
  def __init__(self, config):
- super(PrefixPathMapper, self).__init__(config)
+ super().__init__(config)
  self.prefix_path = abspath(config['path'])
 
  def _path_matches(self, path):
  return path is not None and path.startswith(self.prefix_path)
 
  def to_pattern(self):
- pattern_str = r"(%s%s[^\s,\"\']+)" % (escape(self.prefix_path), escape(sep))
+ pattern_str = r"({}{}[^\s,\"\']+)".format(escape(self.prefix_path), escape(sep))
  return compile(pattern_str)
 
  def to_dict(self):
@@ -728,7 +728,7 @@ class GlobPathMapper(BasePathMapper):
  match_type = 'glob'
 
  def __init__(self, config):
- super(GlobPathMapper, self).__init__(config)
+ super().__init__(config)
  self.glob_path = config['path']
 
  def _path_matches(self, path):
@@ -745,7 +745,7 @@ class RegexPathMapper(BasePathMapper):
  match_type = 'regex'
 
  def __init__(self, config):
- super(RegexPathMapper, self).__init__(config)
+ super().__init__(config)
  self.pattern_raw = config['path']
  self.pattern = compile(self.pattern_raw)
 
@@ -775,7 +775,7 @@ def _mappper_from_dict(mapper_dict):
  return MAPPER_CLASS_DICT[map_type](mapper_dict)
 
 
-class FileLister(object):
+class FileLister:
 
  def __init__(self, config):
  self.depth = int(config.get("depth", "0"))
@@ -793,7 +793,7 @@ def unstructured_map(self, path):
  while depth > 0:
  path = dirname(path)
  depth -= 1
- return dict([(join(path, f), f) for f in directory_files(path)])
+ return {join(path, f): f for f in directory_files(path)}
 
 
 DEFAULT_FILE_LISTER = FileLister(dict(depth=0))
@@ -809,7 +809,7 @@ def unstructured_map(self, path):
  RsyncTransferAction,
  ScpTransferAction,
 ]
-actions = dict([(clazz.action_type, clazz) for clazz in ACTION_CLASSES])
+actions = {clazz.action_type: clazz for clazz in ACTION_CLASSES}
 
 
 __all__ = (

pulsar/client/amqp_exchange.py

@@ -37,7 +37,7 @@
 DEFAULT_REPUBLISH_TIME = 30
 
 
-class PulsarExchange(object):
+class PulsarExchange:
  """ Utility for publishing and consuming structured Pulsar queues using kombu.
     This is shared between the server and client - an exchange should be setup
     for each manager (or in the case of the client, each manager one wished to
@@ -115,7 +115,7 @@ def consume(self, queue_name, callback, check=True, connection_kwargs={}):
  connection.drain_events(timeout=self.__timeout)
  except socket.timeout:
  pass
- except (IOError, socket.error) as exc:
+ except OSError as exc:
  self.__handle_io_error(exc, heartbeat_thread)
  except BaseException:
  log.exception("Problem consuming queue, consumer quitting in problematic fashion!")
@@ -287,7 +287,7 @@ def __queue(self, name):
 
  def __queue_name(self, name):
  key_prefix = self.__key_prefix()
- queue_name = '%s_%s' % (key_prefix, name)
+ queue_name = '{}_{}'.format(key_prefix, name)
  return queue_name
 
  def __key_prefix(self):