diff options
| author | Toshio Kuratomi <a.badger@gmail.com> | 2017-03-23 13:35:05 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-23 13:35:05 -0700 |
| commit | 2fff690caab6a1c6a81973f704be3fbd0bde2c2f (patch) | |
| tree | d30539214f54f7073ca75c11e8077b0c21aff82f /contrib | |
| parent | c7c8481181e96dab508e11917551551f83c5b677 (diff) | |
| download | ansible-2fff690caab6a1c6a81973f704be3fbd0bde2c2f.tar.gz | |
Update module_utils.six to latest (#22855)
* Update module_utils.six to latest
We've been held back on the version of six we could use on the module
side to 1.4.x because of python-2.4 compatibility. Now that our minimum
is Python-2.6, we can update to the latest version of six in
module_utils and get rid of the second copy in lib/ansible/compat.
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/inventory/apstra_aos.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/contrib/inventory/apstra_aos.py b/contrib/inventory/apstra_aos.py index 65838c0814..f0efdc2555 100755 --- a/contrib/inventory/apstra_aos.py +++ b/contrib/inventory/apstra_aos.py @@ -53,19 +53,19 @@ import os import argparse import re -from ansible.compat.six.moves import configparser +try: + import json +except ImportError: + import simplejson as json try: from apstra.aosom.session import Session - HAS_AOS_PYEZ = True except ImportError: HAS_AOS_PYEZ = False -try: - import json -except ImportError: - import simplejson as json +from ansible.module_utils.six.moves import configparser + """ ## |