Bugfix: replace __ALL__ with the correct __all__.

diff --git a/pymin/dispatcher.py b/pymin/dispatcher.py
index af0df0d123b463b0fcb70049e45cc32a74cd5fe7..0d28cb337bf1686d53f46446cdef03ec2272c2bc 100644 (file)
--- a/pymin/dispatcher.py
+++ b/pymin/dispatcher.py
@@ -11,7 +11,7 @@ import re
 import inspect
 import logging ; log = logging.getLogger('pymin.dispatcher')
 
-__ALL__ = ('Error', 'HandlerError', 'CommandNotFoundError', 'Handler',
+__all__ = ('Error', 'HandlerError', 'CommandNotFoundError', 'Handler',
             'Dispatcher', 'handler', 'is_handler', 'get_help')
 
 class Error(RuntimeError):

diff --git a/pymin/eventloop.py b/pymin/eventloop.py
index 0f720120730c1326c5ed852e35883ca96c18b344..5e4bec3b50be0b26026c3a2634ccc2064e6199ef 100644 (file)
--- a/pymin/eventloop.py
+++ b/pymin/eventloop.py
@@ -12,7 +12,7 @@ import signal
 from select import POLLIN, POLLPRI, POLLERR
 import logging ; log = logging.getLogger('pymin.eventloop')
 
-__ALL__ = ('EventLoop', 'LoopInterruptedError')
+__all__ = ('EventLoop', 'LoopInterruptedError')
 
 class LoopInterruptedError(RuntimeError):
     r"""

diff --git a/pymin/procman.py b/pymin/procman.py
index dfa7873a1c2d840184e2ac84e54ca8d5a527f103..80387c480b0bf82951c4684062895bebd41eb628 100644 (file)
--- a/pymin/procman.py
+++ b/pymin/procman.py
@@ -6,7 +6,7 @@ import signal
 import subprocess
 import logging ; log = logging.getLogger('pymin.procman')
 
-__ALL__ = ('ProcessManager', 'manager', 'register', 'unregister', 'call',
+__all__ = ('ProcessManager', 'manager', 'register', 'unregister', 'call',
            'start', 'stop', 'kill', 'get', 'has', 'sigchild_handler')
 
 class ProcessInfo:

diff --git a/pymin/services/dhcp/__init__.py b/pymin/services/dhcp/__init__.py
index 51f7ecbad7f56af65896c3a40ed7b842c4b14457..b5bf6f3801ea46bd9ad0c79197921462a5f37c83 100644 (file)
--- a/pymin/services/dhcp/__init__.py
+++ b/pymin/services/dhcp/__init__.py
@@ -9,7 +9,7 @@ from pymin.services.util import Restorable, ConfigWriter, InitdHandler, \
                                 TransactionalHandler, ParametersHandler, \
                                 DictSubHandler, ReloadHandler
 
-__ALL__ = ('DhcpHandler',)
+__all__ = ('DhcpHandler',)
 
 class Host(Sequence):
     r"""Host(name, ip, mac) -> Host instance :: Class representing a host.

diff --git a/pymin/services/dns/__init__.py b/pymin/services/dns/__init__.py
index f57386c9f4dcf474d9371946ffeae9a423579bda..0576cd05721b28f0770e0be88021c09cfceb430f 100644 (file)
--- a/pymin/services/dns/__init__.py
+++ b/pymin/services/dns/__init__.py
@@ -11,7 +11,7 @@ from pymin.services.util import Restorable, ConfigWriter, InitdHandler, \
                                 TransactionalHandler, ParametersHandler, \
                                 DictComposedSubHandler, DictSubHandler, call
 
-__ALL__ = ('DnsHandler',)
+__all__ = ('DnsHandler',)
 
 class Host(Sequence):
     def __init__(self, name, ip):

diff --git a/pymin/services/firewall/__init__.py b/pymin/services/firewall/__init__.py
index 8809235edb262c43e292026bfd25ae24bfbabd45..c1b6e61e3f445457bb33900d89122f88006f9317 100644 (file)
--- a/pymin/services/firewall/__init__.py
+++ b/pymin/services/firewall/__init__.py
@@ -11,7 +11,7 @@ from pymin.dispatcher import Handler, handler, HandlerError
 from pymin.services.util import Restorable, ConfigWriter, ServiceHandler, \
                                 TransactionalHandler, ListSubHandler
 
-__ALL__ = ('FirewallHandler',)
+__all__ = ('FirewallHandler',)
 
 class Rule(Sequence):
     r"""Rule(chain, target[, src[, dst[, ...]]]) -> Rule instance.

diff --git a/pymin/services/ip/__init__.py b/pymin/services/ip/__init__.py
index a7e23cba0a251b40122f0eb1e8c8ec4eb0ebd922..98690985575f0f8b7bcd7e5d55e879b97946543d 100644 (file)
--- a/pymin/services/ip/__init__.py
+++ b/pymin/services/ip/__init__.py
@@ -12,7 +12,7 @@ from pymin.services.util import Restorable, ConfigWriter, InitdHandler, \
                                 DictComposedSubHandler, Device, Address, \
                                 ExecutionError
 
-__ALL__ = ('IpHandler',)
+__all__ = ('IpHandler',)
 
 # TODO: convertir HopHandler a ComposedSubHandler
 

diff --git a/pymin/services/nat/__init__.py b/pymin/services/nat/__init__.py
index 21a357e6c2712965ace241a3ec140a65bc6996a0..34d5b0dc231e74a825d0c5be2a2260667cc5abe3 100644 (file)
--- a/pymin/services/nat/__init__.py
+++ b/pymin/services/nat/__init__.py
@@ -9,7 +9,7 @@ from pymin.services.util import Restorable, ConfigWriter, RestartHandler, \
                                 ReloadHandler, TransactionalHandler, \
                                 ServiceHandler, ListSubHandler, call
 
-__ALL__ = ('NatHandler',)
+__all__ = ('NatHandler',)
 
 class PortForward(Sequence):
     r"""PortForward(dev, protocol, port, dst[, dst_port[, ...]]) -> PortForward.

diff --git a/pymin/services/ppp/__init__.py b/pymin/services/ppp/__init__.py
index 1dce3158f90650bb440f565212900cece647303f..6ee9f5a97218ae0ae5e994c601207968c3fc79e3 100644 (file)
--- a/pymin/services/ppp/__init__.py
+++ b/pymin/services/ppp/__init__.py
@@ -11,7 +11,7 @@ from pymin.dispatcher import Handler, handler, HandlerError
 from pymin.services.util import Restorable, ConfigWriter, ReloadHandler, \
                                 TransactionalHandler, DictSubHandler, call
 
-__ALL__ = ('PppHandler',)
+__all__ = ('PppHandler',)
 
 class ConnectionError(HandlerError, KeyError):
     r"""

diff --git a/pymin/services/proxy/__init__.py b/pymin/services/proxy/__init__.py
index 1e24cd44656e2ed66cb16268ddd1bd6291c59371..5ab624beba4737f26ec3efbd664c6b07505aa989 100644 (file)
--- a/pymin/services/proxy/__init__.py
+++ b/pymin/services/proxy/__init__.py
@@ -11,7 +11,7 @@ from pymin.services.util import Restorable, ConfigWriter, InitdHandler, \
 
 import crypt
 
-__ALL__ = ('ProxyHandler',)
+__all__ = ('ProxyHandler',)
 
 class Host(Sequence):
     def __init__(self,ip):

diff --git a/pymin/services/qos/__init__.py b/pymin/services/qos/__init__.py
index 905e4cafbd55b921225e3e6e159b436820a0e2d5..b583d4d350fbbf6b9b4aaccb5e4539d6967bae86 100644 (file)
--- a/pymin/services/qos/__init__.py
+++ b/pymin/services/qos/__init__.py
@@ -10,7 +10,7 @@ from pymin.services.util import Restorable, ConfigWriter, InitdHandler, \
                                 get_network_devices, ListComposedSubHandler, \
                                 DictComposedSubHandler, ExecutionError
 
-__ALL__ = ('QoSHandler',)
+__all__ = ('QoSHandler',)
 
 class DeviceError(HandlerError):
 

diff --git a/pymin/services/util.py b/pymin/services/util.py
index 69864cf36c0949ada6ba4a55fed7ef6b8307a75a..acb953988d21493e865f045a503b658e66b9583c 100644 (file)
--- a/pymin/services/util.py
+++ b/pymin/services/util.py
@@ -17,7 +17,7 @@ from pymin.seqtools import Sequence
 #DEBUG = False
 DEBUG = True
 
-__ALL__ = ('Error', 'ExecutionError', 'ItemError', 'ItemAlreadyExistsError',
+__all__ = ('Error', 'ExecutionError', 'ItemError', 'ItemAlreadyExistsError',
            'ItemNotFoundError', 'ContainerError', 'ContainerNotFoundError',
            'call', 'get_network_devices', 'Persistent', 'Restorable',
            'ConfigWriter', 'ServiceHandler', 'RestartHandler',

diff --git a/pymin/services/vrrp/__init__.py b/pymin/services/vrrp/__init__.py
index f13db3ebf7b29f1b654c9230abc09397b11294ea..30be5a12e2df86c5e947866f0f53dad219266bc7 100644 (file)
--- a/pymin/services/vrrp/__init__.py
+++ b/pymin/services/vrrp/__init__.py
@@ -13,7 +13,7 @@ from pymin.services.util import Restorable, TransactionalHandler, \
                                 ReloadHandler, RestartHandler, \
                                 ServiceHandler, ParametersHandler, call
 
-__ALL__ = ('VrrpHandler',)
+__all__ = ('VrrpHandler',)
 
 # FIXME the the command should not use new parameters unless commit where called
 #       i.e. integrate commit with procman to update internal procman parameters.

diff --git a/pymin/validatedclass.py b/pymin/validatedclass.py
index 3ad8aecea38ca4c772bd25d6912c9fabd419503e..2e596dc9e92e5bec893acbf6b6653d1cbd424165 100644 (file)
--- a/pymin/validatedclass.py
+++ b/pymin/validatedclass.py
@@ -70,7 +70,7 @@ attributes using Field instances. For example:
 Nice, ugh?
 """
 
-__ALL__ = ('Field', 'ValidatedClass')
+__all__ = ('Field', 'ValidatedClass')
 
 from formencode import Invalid
 from formencode.schema import Schema