diff options
| author | Matt Martz <matt@sivel.net> | 2018-08-10 18:13:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-10 18:13:29 +0200 |
| commit | c1c229c6d4cf74d022c56a17061ab57918822f88 (patch) | |
| tree | 38f51a32506e108d65c259a4899c6edd37d2144c /contrib/inventory/collins.py | |
| parent | nxos_vlan refactor to support non structured output (#43805) (diff) | |
| download | ansible-c1c229c6d4cf74d022c56a17061ab57918822f88.tar.xz ansible-c1c229c6d4cf74d022c56a17061ab57918822f88.zip | |
Remove use of simplejson throughout code base (#43548)
* Remove use of simplejson throughout code base. Fixes #42761
* Address failing tests
* Remove simplejson from contrib and other outlying files
* Add changelog fragment for simplejson removal
Diffstat (limited to 'contrib/inventory/collins.py')
| -rwxr-xr-x | contrib/inventory/collins.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/contrib/inventory/collins.py b/contrib/inventory/collins.py index a6af0d7302..8c7b36c9bc 100755 --- a/contrib/inventory/collins.py +++ b/contrib/inventory/collins.py @@ -75,10 +75,7 @@ import sys from time import time import traceback -try: - import json -except ImportError: - import simplejson as json +import json from six import iteritems from six.moves.urllib.parse import urlencode |