valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Various lint fixes

Browse Source
This commit is contained in:
Thomas S Hatch 2014-03-07 16:24:22 -07:00
parent 787274f584
commit dd37d3dcb7
5 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
salt/daemons/flo/minion.py
View File

@ -88,15 +88,6 @@ class RouterMinion(ioflo.base.deeding.Deed): # pylint: disable=W0232
self.udp_stack.value.eids[estate]) self.udp_stack.value.eids[estate])
class PillarLoad(ioflo.base.deeding.Deed): # pylint: disable=W0232
'''
Load up the pillar in the data store
'''
Ioinits = {'opts_store': '.salt.opts',
'grains': '.salt.loader.grains'}
class ModulesLoad(ioflo.base.deeding.Deed): # pylint: disable=W0232 class ModulesLoad(ioflo.base.deeding.Deed): # pylint: disable=W0232
''' '''
Reload the minion modules Reload the minion modules

1
salt/utils/aggregation.py
View File

@ -120,6 +120,7 @@ class Aggregate(object):
""" """
pass pass
class Map(OrderedDict, Aggregate): class Map(OrderedDict, Aggregate):
""" """
Map aggregation. Map aggregation.

3
salt/utils/cloud.py
View File

@ -16,6 +16,7 @@ import multiprocessing
import logging import logging
import pipes import pipes
import json import json
import copy
import re import re
# Let's import pwd and catch the ImportError. We'll raise it if this is not # Let's import pwd and catch the ImportError. We'll raise it if this is not
@ -286,7 +287,7 @@ def bootstrap(vm_, opts):
log.info('Provisioning existing machine {0}'.format(vm_['name'])) log.info('Provisioning existing machine {0}'.format(vm_['name']))
ssh_username = salt.config.get_cloud_config_value('ssh_username', vm_, opts) ssh_username = salt.config.get_cloud_config_value('ssh_username', vm_, opts)
deploy_script = script(vm_) deploy_script = os_script(vm_)
deploy_kwargs = { deploy_kwargs = {
'host': vm_['ssh_host'], 'host': vm_['ssh_host'],
'username': ssh_username, 'username': ssh_username,

5
salt/utils/serializers/sls.py
View File

@ -147,7 +147,6 @@ def deserialize(stream_or_string, **options):
except ConstructorError as error: except ConstructorError as error:
raise DeserializationError(error) raise DeserializationError(error)
except Exception as error: except Exception as error:
raise
raise DeserializationError(error) raise DeserializationError(error)
@ -171,7 +170,7 @@ def serialize(obj, **options):
raise SerializationError(error) raise SerializationError(error)
class Loader(BaseLoader): class Loader(BaseLoader): # pylint: disable=W0232
''' '''
Create a custom YAML loader that uses the custom constructor. This allows Create a custom YAML loader that uses the custom constructor. This allows
for the YAML loading defaults to be manipulated based on needs within salt for the YAML loading defaults to be manipulated based on needs within salt
@ -330,7 +329,7 @@ class SLSMap(OrderedDict):
def __str__(self): def __str__(self):
return serialize(self, default_flow_style=True) return serialize(self, default_flow_style=True)
def __repr__(self): def __repr__(self, _repr_running={}):
return serialize(self, default_flow_style=True) return serialize(self, default_flow_style=True)

4
salt/utils/serializers/yaml.py
View File

@ -75,7 +75,7 @@ def serialize(obj, **options):
raise SerializationError(error) raise SerializationError(error)
class Loader(BaseLoader): class Loader(BaseLoader): # pylint: disable=W0232
"""Overwrites Loader as not for polute legacy Loader""" """Overwrites Loader as not for polute legacy Loader"""
pass pass
@ -94,7 +94,7 @@ Loader.add_multi_constructor('tag:yaml.org,2002:map', Loader.construct_yaml_map)
Loader.add_multi_constructor(None, Loader.construct_undefined) Loader.add_multi_constructor(None, Loader.construct_undefined)
class Dumper(BaseDumper): class Dumper(BaseDumper): # pylint: disable=W0232
"""Overwrites Dumper as not for polute legacy Dumper""" """Overwrites Dumper as not for polute legacy Dumper"""
pass pass