Changed the wildly inaccurate device_fd to device_pointer.

4 files changed, 13 insertions, 17 deletions

diff --git a/python/TODO b/python/TODO
index 890efec..17453b5 100644
--- a/python/TODO
+++ b/python/TODO
@@ -37,10 +37,6 @@ The script does this:
 
 TODO
 ====
- * passing a string in evemu_new is a vestage of some old C code
-   - since it's no longer used, let's not expose it in Python
-   - remove all references to deivce name
-   - pass a null strig to the c lib under the covers
  * rename device_fd to device_pointer
  * EvEmuWrapper creates a device in __init__
    - the create() method should check to see if there's a device already
diff --git a/python/evemu/device.py b/python/evemu/device.py
index fe518cb..91b681f 100644
--- a/python/evemu/device.py
+++ b/python/evemu/device.py
@@ -17,13 +17,13 @@ class EvEmuDevice(base.EvEmuBase):
         # The C API expects a device name to be passed, however, it doesn't do
         # anything with it, so we're not going to provide it as an option in
         # the Python API.
-        self._device = device_new("")
+        self._device_pointer = device_new("")
         self._node = ""
         self._device_file_stream = None
         self._uinput_fd = None
 
     def __del__(self):
-        self.get_lib().evemu_delete(self._device)
+        self.get_lib().evemu_delete(self._device_pointer)
         del(self._device_file_stream)
         if self._uinput_fd:
             os.close(self._uinput_fd)
@@ -37,8 +37,8 @@ class EvEmuDevice(base.EvEmuBase):
     def get_lib(self):
         return self._lib
 
-    def get_device_fd(self):
-        return self._device
+    def get_device_pointer(self):
+        return self._device_pointer
 
     def get_node_name(self):
         if not self._node:
@@ -51,7 +51,7 @@ class EvEmuDevice(base.EvEmuBase):
             self.get_c_lib().fopen, device_file, "r")
         self._call(
             self.get_lib().evemu_read,
-            self.get_device_fd(),
+            self.get_device_pointer(),
             self._device_file_stream)
 
     def create_node(self, device_file):
@@ -60,15 +60,15 @@ class EvEmuDevice(base.EvEmuBase):
         # create the node
         self._input_fd = os.open(const.UINPUT_NODE, os.O_WRONLY)
         self._call(
-            self.get_lib().evemu_create, self.get_device_fd(), self._input_fd)
+            self.get_lib().evemu_create, self.get_device_pointer(), self._input_fd)
 
     @property
     def version(self):
-        return self.get_lib().evemu_get_version(self.get_device_fd())
+        return self.get_lib().evemu_get_version(self.get_device_pointer())
 
     @property
     def name(self):
-        return self.get_lib().evemu_get_name(self.get_device_fd())
+        return self.get_lib().evemu_get_name(self.get_device_pointer())
 
     @property
     def id_bustype(self):
diff --git a/python/evemu/tests/test_device.py b/python/evemu/tests/test_device.py
index 21c183b..dd4e620 100644
--- a/python/evemu/tests/test_device.py
+++ b/python/evemu/tests/test_device.py
@@ -16,15 +16,15 @@ class EvEmuDeviceTestCase(BaseTestCase):
         del(self.device)
 
     def test_initialize(self):
-        self.assertTrue(self.device._device is not None)
+        self.assertTrue(self.device._device_pointer is not None)
 
     def XXX_test_get_lib(self):
         lib = self.device.get_lib()
         self.assertTrue(lib is not None)
 
-    def XXX_test_get_device_fd(self):
-        fd = self.device.get_device_fd()
-        self.assertEqual(type(fd), int)
+    def XXX_test_get_device_pointer(self):
+        pointer = self.device.get_device_pointer()
+        self.assertEqual(type(pointer), int)
 
     def XXX_test_read(self):
         pass
diff --git a/python/evemu/wrapper.py b/python/evemu/wrapper.py
index f0dbc47..d314b21 100644
--- a/python/evemu/wrapper.py
+++ b/python/evemu/wrapper.py
@@ -23,7 +23,7 @@ class EvEmuWrapper(base.EvEmuBase):
         return self.get_device()
 
     def get_device(self):
-        return self.device.get_device_fd()
+        return self.device.get_device_pointer()
 
     def read(self, filename):
         # XXX this may be borked and thus may need to be re-examined