Skip to content

Commit 10167d4

Browse files
authored
Merge pull request #41 from saltstack-formulas/is-list-replaces-class
Replace [].__class__ with is_list, fixes #40
2 parents 1a0a422 + 942d0b5 commit 10167d4

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

snmp/files/snmpd.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -510,7 +510,7 @@ createUser {{ user.username }} {{ user.get('authproto', 'MD5') }} {{ user.get('a
510510
{%- endfor %}
511511

512512
{% for declaration, values in config.items() %}
513-
{%- if values.__class__ in (().__class__, [].__class__) %}
513+
{%- if values | is_iter %}
514514
{%- for value in values %}
515515
{{declaration}} {{value}}
516516
{%- endfor %}

snmp/files/snmpd.conf.minimal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ createUser {{ user.username }} {{ user.get('authproto', 'MD5') }} {{ user.passph
8383

8484
# Extra settings
8585
{% for declaration, values in config.items() %}
86-
{%- if values.__class__ in (().__class__, [].__class__) %}
86+
{%- if values | is_iter %}
8787
{%- for value in values %}
8888
{{declaration}} {{value}}
8989
{%- endfor %}

snmp/macros.jinja

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
{%- macro v12c_communities(mode, proto='') -%}
55
{% set communities = conf.get(mode+'communities'+proto, []) -%}
66
{%- for community in communities %}
7-
{%- if communities.__class__ == {}.__class__ and communities.get(community, {}) is mapping %}
7+
{%- if communities is mapping and communities.get(community, {}) is mapping %}
88
{%- set source = communities.get(community).get('source', '') %}
99
{%- set view = communities.get(community).get('view', None) %}
1010
{%- else %}
1111
{%- set source = '' %}
1212
{%- set view = '' %}
1313
{%- endif %}
14-
{%- if not source.__class__ in (().__class__, [].__class__) %}
14+
{%- if not source | is_iter %}
1515
{%- set source = [source] %}
1616
{%- endif %}
1717
{%- for src in source -%}

0 commit comments

Comments
 (0)