* python/_dbus.py, _util.py, decorators.py, extract.py, matchrules.py.

  proxies.py, service.py: Cleanup of code after running it through the
  pyflakes code checker mostly dealing with undefined names.
  (Bug #3828, Patch from Anthony Baxter <anthony@interlink.com.au>)

diff --git a/ChangeLog b/ChangeLog
index fd81667540cb438eb03090746b21ac4b93ffd64a..0158c1a2a552d8a452b50bfd52f37bfacf0d076e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-07-20  John (J5) Palmieir  <johnp@redhat.com>
+
+       * python/_dbus.py, _util.py, decorators.py, extract.py, matchrules.py.
+       proxies.py, service.py: Cleanup of code after running it through the
+       pyflakes code checker mostly dealing with undefined names.  
+       (Bug #3828, Patch from Anthony Baxter <anthony@interlink.com.au>)
+
 2005-07-17  John (J5) Palmieri  <johnp@redhat.com>
 
        * NEWS: Update to 0.35.2

diff --git a/python/_dbus.py b/python/_dbus.py
index 7bab585639adcacf0d260fd1ec6698ca6292fbca..f0c7b0695e32db0e1a61f01f4bf8e0d177bdd99c 100644 (file)
--- a/python/_dbus.py
+++ b/python/_dbus.py
@@ -48,9 +48,6 @@ from proxies import *
 from exceptions import *
 from matchrules import *
 
-import re
-import inspect
-
 class Bus:
     """A connection to a DBus daemon.
 

diff --git a/python/_util.py b/python/_util.py
index 3f7061c3f9403807dfff5beda7e7df92bce2b440..c254178ec59d8e9ff1f0f73ff2fa67b8f4d15814 100644 (file)
--- a/python/_util.py
+++ b/python/_util.py
@@ -1,4 +1,5 @@
 import re
+from exceptions import ValidationException
 
 def _validate_interface_or_name(value):
     elements = value.split('.')

diff --git a/python/decorators.py b/python/decorators.py
index 2deec6d0dd15fb1ca539bff30031cfda98e6b6af..b94babc4d6f3bb19e2a2263dcb9c4b5582b7d0f1 100644 (file)
--- a/python/decorators.py
+++ b/python/decorators.py
@@ -1,7 +1,6 @@
 import _util 
 import inspect
 import dbus_bindings
-import new
 
 def method(dbus_interface):
     _util._validate_interface_or_name(dbus_interface)

diff --git a/python/extract.py b/python/extract.py
index f836edc748e74f1fc44c3320e285923d3b61974d..3cdb9755e20e30cd34b71e7ea2370d90f6c4c464 100644 (file)
--- a/python/extract.py
+++ b/python/extract.py
@@ -1,7 +1,5 @@
 import commands
-import glob
 import re
-import os
 import string
 import sys
 

diff --git a/python/matchrules.py b/python/matchrules.py
index 9a7edb3e00439cbed7fd4778473589f294a54380..d65e3920f8a5eefc7a96ca348e85ff0e0c770b0b 100644 (file)
--- a/python/matchrules.py
+++ b/python/matchrules.py
@@ -1,4 +1,4 @@
-from exceptions import *
+from exceptions import DBusException
 
 class SignalMatchNode:
     def __init__(self):

diff --git a/python/proxies.py b/python/proxies.py
index 688dd8ab8756e115af73bab68ffbf8d64cebd3cf..95c98a9c1ddaf24ac01b994a6b3addf33d8363d6 100644 (file)
--- a/python/proxies.py
+++ b/python/proxies.py
@@ -1,4 +1,5 @@
 import dbus_bindings
+from exceptions import MissingReplyHandlerException, MissingErrorHandlerException
 
 class ProxyMethod:
     """A proxy Method.
@@ -29,7 +30,7 @@ class ProxyMethod:
 
         if not(reply_handler and error_handler):
             if reply_handler:
-                raise MissingErrorself, HandlerException()
+                raise MissingErrorHandlerException()
             elif error_handler:
                 raise MissingReplyHandlerException()
 

diff --git a/python/service.py b/python/service.py
index f6a1c7fd54c6a5d6714479f3a45f37d020c92c61..edaef63ff6d787ad03ff52fe199a93e0a3a62535 100644 (file)
--- a/python/service.py
+++ b/python/service.py
@@ -1,6 +1,7 @@
-from decorators import *
 
 import dbus_bindings 
+import _dbus
+from exceptions import UnknownMethodException
 
 class BusName:
     """A base class for exporting your own Named Services across the Bus
@@ -10,7 +11,7 @@ class BusName:
                              
         if bus == None:
             # Get the default bus
-            self._bus = Bus()
+            self._bus = _dbus.Bus()
         else:
             self._bus = bus