From: W. Trevor King <wking@drexel.edu>
Date: Mon, 23 Jan 2012 20:53:04 +0000 (-0500)
Subject: Oops, `def` is a reserved word in Python.  Use `defc` instead.
X-Git-Tag: v0.4~44
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6586062828d064ecf544fc6a6ba38021bd67c9c8;p=pyafm.git

Oops, `def` is a reserved word in Python.  Use `defc` instead.
---

diff --git a/pyafm/afm.py b/pyafm/afm.py
index a73b597..0417e6b 100644
--- a/pyafm/afm.py
+++ b/pyafm/afm.py
@@ -83,10 +83,10 @@ class AFM (object):
         stepper_tolerance = 2*self.stepper.step_size
 
         axis = self.piezo.axis_by_name(self.axis_name)
-        def = self._deflection_channel()
+        defc = self._deflection_channel()
 
         zero = _convert_volts_to_bits(axis.config['channel'], 0)
-        target_def = _convert_volts_to_bits(def.config, setpoint)
+        target_def = _convert_volts_to_bits(defc.config, setpoint)
         self._check_target_deflection(target_def)
 
         _LOG.debug('zero the %s piezo output' % self.axis_name)
@@ -151,8 +151,8 @@ class AFM (object):
             % (depth, self.stepper.position, target, target_m))
 
     def _check_target_deflection(self, target_deflection):
-        def = self._deflection_channel()
-        max_def = def.get_maxdata():
+        defc = self._deflection_channel()
+        max_def = defc.get_maxdata():
         if target_deflection > max_def:
             _LOG.error(('requested setpoint ({:g} V = {:d} bits) is larger '
                         'than the maximum deflection value of {:d} bits'