summaryrefslogtreecommitdiff
path: root/pyparallel/parallel/parallelppdev.py
diff options
context:
space:
mode:
authorcliechti <cliechti@f19166aa-fa4f-0410-85c2-fa1106f25c8a>2009-07-30 21:36:06 +0000
committercliechti <cliechti@f19166aa-fa4f-0410-85c2-fa1106f25c8a>2009-07-30 21:36:06 +0000
commit447b50a6dedb5240dd6ce890b6f5d5323a34d980 (patch)
treee39d76703aef0e5f6ee244ae421f3f7fe6857940 /pyparallel/parallel/parallelppdev.py
parent3509fba7dc90b3fc6f18687993547af6d4cc398d (diff)
downloadpyserial-git-447b50a6dedb5240dd6ce890b6f5d5323a34d980.tar.gz
- create tag for 2.5-rc1release0_2
- fix name of old 0.2 tag
Diffstat (limited to 'pyparallel/parallel/parallelppdev.py')
-rw-r--r--pyparallel/parallel/parallelppdev.py22
1 files changed, 6 insertions, 16 deletions
diff --git a/pyparallel/parallel/parallelppdev.py b/pyparallel/parallel/parallelppdev.py
index d600c4a..18cc54c 100644
--- a/pyparallel/parallel/parallelppdev.py
+++ b/pyparallel/parallel/parallelppdev.py
@@ -183,21 +183,15 @@ class Parallel:
self.device = port
else:
self.device = "/dev/parport%d" % port
- self._fd = None
self._fd = os.open(self.device, os.O_RDWR)
- try:
- self.PPEXCL()
- self.PPCLAIM()
- self.setDataDir(1)
- self.setData(0)
- except IOError:
- os.close(self._fd)
- self._fd = None
- raise
+ self.PPEXCL()
+ self.PPCLAIM()
+ self.setDataDir(1)
+ self.setData(0)
def __del__(self):
+ self.PPRELEASE()
if self._fd is not None:
- self.PPRELEASE()
os.close(self._fd)
def timevalToFloat(self, timeval):
@@ -567,12 +561,8 @@ class Parallel:
"""Sets the states of the data bus line drivers (pins 2-9)"""
self._data=d
return self.PPWDATA(d)
-
- def getData(self):
- """Gets the states of the data bus line (pin 2-9)"""
- return self.PPRDATA()
- # status lines
+ #status lines
def getInError(self):
"""Returns the level on the nFault pin (15)"""
return (self.PPRSTATUS() & PARPORT_STATUS_ERROR) != 0