From 8d52115e230ebf5dd657f60021e27362ca8ed99e Mon Sep 17 00:00:00 2001 From: Leandro Lucarella Date: Wed, 2 Jan 2008 00:31:24 -0200 Subject: [PATCH] Bugfix: replace __ALL__ with the correct __all__. --- pymin/dispatcher.py | 2 +- pymin/eventloop.py | 2 +- pymin/procman.py | 2 +- pymin/services/dhcp/__init__.py | 2 +- pymin/services/dns/__init__.py | 2 +- pymin/services/firewall/__init__.py | 2 +- pymin/services/ip/__init__.py | 2 +- pymin/services/nat/__init__.py | 2 +- pymin/services/ppp/__init__.py | 2 +- pymin/services/proxy/__init__.py | 2 +- pymin/services/qos/__init__.py | 2 +- pymin/services/util.py | 2 +- pymin/services/vrrp/__init__.py | 2 +- pymin/validatedclass.py | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pymin/dispatcher.py b/pymin/dispatcher.py index af0df0d..0d28cb3 100644 --- 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 0f72012..5e4bec3 100644 --- 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 dfa7873..80387c4 100644 --- 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 51f7ecb..b5bf6f3 100644 --- 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 f57386c..0576cd0 100644 --- 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 8809235..c1b6e61 100644 --- 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 a7e23cb..9869098 100644 --- 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 21a357e..34d5b0d 100644 --- 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 1dce315..6ee9f5a 100644 --- 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 1e24cd4..5ab624b 100644 --- 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 905e4ca..b583d4d 100644 --- 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 69864cf..acb9539 100644 --- 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 f13db3e..30be5a1 100644 --- 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 3ad8aec..2e596dc 100644 --- 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 -- 2.43.0