diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2014-01-30 07:30:18 -0500 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2014-01-30 07:30:18 -0500 |
| commit | 8ac001a3dffebf8e7d3fa7db20f13e58b90dd5b4 (patch) | |
| tree | f702c14114347966d0ff1d2bd15e494f3fa62015 /src/lib/Bcfg2 | |
| parent | 9be8b7fb9eef3aa9cc7d44adb565dad7625ede4f (diff) | |
| download | bcfg2-8ac001a3dffebf8e7d3fa7db20f13e58b90dd5b4.tar.gz bcfg2-8ac001a3dffebf8e7d3fa7db20f13e58b90dd5b4.tar.bz2 bcfg2-8ac001a3dffebf8e7d3fa7db20f13e58b90dd5b4.zip | |
fixed pylint tests
Diffstat (limited to 'src/lib/Bcfg2')
| -rw-r--r-- | src/lib/Bcfg2/Client/XML.py | 4 | ||||
| -rw-r--r-- | src/lib/Bcfg2/Server/Lint/ValidateJSON.py | 3 | ||||
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Ohai.py | 3 | ||||
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Packages/Yum.py | 3 | ||||
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Probes.py | 3 | ||||
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Properties.py | 3 |
6 files changed, 12 insertions, 7 deletions
diff --git a/src/lib/Bcfg2/Client/XML.py b/src/lib/Bcfg2/Client/XML.py index e35ce4497..4ba06abae 100644 --- a/src/lib/Bcfg2/Client/XML.py +++ b/src/lib/Bcfg2/Client/XML.py @@ -11,9 +11,9 @@ try: from Bcfg2.Compat import wraps driver = 'lxml' + # libxml2 2.9.0+ doesn't parse 10M+ documents by default: + # https://mail.gnome.org/archives/commits-list/2012-August/msg00645.html try: - # libxml2 2.9.0+ doesn't parse 10M+ documents by default: - # https://mail.gnome.org/archives/commits-list/2012-August/msg00645.html _parser = XMLParser(huge_tree=True) except TypeError: _parser = XMLParser() diff --git a/src/lib/Bcfg2/Server/Lint/ValidateJSON.py b/src/lib/Bcfg2/Server/Lint/ValidateJSON.py index 31bbadeb2..1f55962eb 100644 --- a/src/lib/Bcfg2/Server/Lint/ValidateJSON.py +++ b/src/lib/Bcfg2/Server/Lint/ValidateJSON.py @@ -10,7 +10,8 @@ import Bcfg2.Server.Lint try: import json - json.loads # py2.4 json library is structured differently + # py2.4 json library is structured differently + json.loads # pylint: disable=W0104 except (ImportError, AttributeError): import simplejson as json diff --git a/src/lib/Bcfg2/Server/Plugins/Ohai.py b/src/lib/Bcfg2/Server/Plugins/Ohai.py index f5bde1820..0853ea993 100644 --- a/src/lib/Bcfg2/Server/Plugins/Ohai.py +++ b/src/lib/Bcfg2/Server/Plugins/Ohai.py @@ -10,7 +10,8 @@ import Bcfg2.Server.Plugin try: import json - json.loads # py2.4 json library is structured differently + # py2.4 json library is structured differently + json.loads # pylint: disable=W0104 except (ImportError, AttributeError): import simplejson as json diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py b/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py index 43a54471c..f038ec9c0 100644 --- a/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py +++ b/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py @@ -87,7 +87,8 @@ try: import yum try: import json - json.loads # py2.4 json library is structured differently + # py2.4 json library is structured differently + json.loads # pylint: disable=W0104 except (ImportError, AttributeError): import simplejson as json HAS_YUM = True diff --git a/src/lib/Bcfg2/Server/Plugins/Probes.py b/src/lib/Bcfg2/Server/Plugins/Probes.py index 471ebfdaf..48be1ac26 100644 --- a/src/lib/Bcfg2/Server/Plugins/Probes.py +++ b/src/lib/Bcfg2/Server/Plugins/Probes.py @@ -34,7 +34,8 @@ except ImportError: try: import json - json.loads # py2.4 json library is structured differently + # py2.4 json library is structured differently + json.loads # pylint: disable=W0104 HAS_JSON = True except (ImportError, AttributeError): try: diff --git a/src/lib/Bcfg2/Server/Plugins/Properties.py b/src/lib/Bcfg2/Server/Plugins/Properties.py index b6090c4d1..8c6cf799a 100644 --- a/src/lib/Bcfg2/Server/Plugins/Properties.py +++ b/src/lib/Bcfg2/Server/Plugins/Properties.py @@ -17,7 +17,8 @@ except ImportError: try: import json - json.loads # py2.4 json library is structured differently + # py2.4 json library is structured differently + json.loads # pylint: disable=W0104 HAS_JSON = True except (ImportError, AttributeError): try: |