From: W. Trevor King <wking@drexel.edu>
Date: Thu, 3 Jun 2010 16:22:38 +0000 (-0400)
Subject: Don't join directory in WTKDriver.__find_previous_cantilever_calibration_file().
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fec46413c3652ac9fba155da021f7125e318d166;p=hooke.git

Don't join directory in WTKDriver.__find_previous_cantilever_calibration_file().

We already did that in ._list_cantilever_calibration_files().
---

diff --git a/hooke/driver/wtk.py b/hooke/driver/wtk.py
index ec7670d..ca3f2c9 100644
--- a/hooke/driver/wtk.py
+++ b/hooke/driver/wtk.py
@@ -248,7 +248,7 @@ class WTKDriver (Driver):
             if self._calibfile_timestamp(calibfiles[i]) > timestamp:
                 i -= 1
                 break
-        return os.path.join(dir, calibfiles[i])
+        return calibfiles[i]
 
     def _read_cantilever_calibration_file(self, filename):
         ret = {'file': filename}