diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-09-24 13:25:01 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-09-25 11:58:48 -0400 |
| commit | 3428eab79ab21d1ecee6d2f8edff083a2cccdf79 (patch) | |
| tree | 9f19144fe7d5161c9208f50aa0b6a9945682a967 /src/lib/Bcfg2/Compat.py | |
| parent | 6d4d8df68717780239fad273dd722359db10e64b (diff) | |
| download | bcfg2-3428eab79ab21d1ecee6d2f8edff083a2cccdf79.tar.gz bcfg2-3428eab79ab21d1ecee6d2f8edff083a2cccdf79.tar.bz2 bcfg2-3428eab79ab21d1ecee6d2f8edff083a2cccdf79.zip | |
made json optional again
Diffstat (limited to 'src/lib/Bcfg2/Compat.py')
| -rw-r--r-- | src/lib/Bcfg2/Compat.py | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/lib/Bcfg2/Compat.py b/src/lib/Bcfg2/Compat.py index 4daba5b8c..9aeda6d36 100644 --- a/src/lib/Bcfg2/Compat.py +++ b/src/lib/Bcfg2/Compat.py @@ -245,12 +245,6 @@ except ImportError: try: - import json -except ImportError: - import simplejson as json - - -try: from functools import wraps except ImportError: def wraps(wrapped): |