Merge c264103 into 788afd7

pyfarm/jobtypes/core/jobtype.py

@@ -29,7 +29,6 @@
 import tempfile
 from errno import EEXIST
 from datetime import datetime, timedelta
-from functools import partial
 from string import Template
 from os.path import expanduser, abspath, isdir, join
 from pprint import pformat
@@ -44,7 +43,6 @@
 
 import treq
 from twisted.internet import reactor
-from twisted.internet.defer import Deferred
 from twisted.internet.error import ProcessDone, ProcessTerminated
 from twisted.python.failure import Failure
 from twisted.internet.defer import inlineCallbacks, Deferred, returnValue
@@ -55,7 +53,7 @@
 from pyfarm.core.enums import INTEGER_TYPES, STRING_TYPES, WorkState, WINDOWS
 from pyfarm.core.utility import ImmutableDict
 from pyfarm.agent.config import config
-from pyfarm.agent.http.core.client import post, http_retry_delay, post_direct
+from pyfarm.agent.http.core.client import http_retry_delay, post_direct
 from pyfarm.agent.logger import getLogger
 from pyfarm.agent.sysinfo import memory, system
 from pyfarm.agent.sysinfo.user import is_administrator, username
@@ -646,6 +644,7 @@ def get_command_data(self):
         raise NotImplementedError("`get_command_data` must be implemented")
 
     # TODO: finish map_path() implementation
+    # TODO: update TestJobTypeMapPath
     def map_path(self, path):
         """
         Takes a string argument.  Translates a given path for any OS to
@@ -663,10 +662,10 @@ def map_path(self, path):
 
     def expandvars(self, value, environment=None, expand=None):
         """
-        Expands variables inside of a string using an environment.  Exp
+        Expands variables inside of a string using an environment.
 
         :param string value:
-            The path to expand
+            The string to expand.
 
         :param dict environment:
             The environment to use for expanding ``value``.  If this