diff options
| author |   David Medina <davidmedina9@gmail.com> | 2012-05-12 23:08:55 +0200 |
|---|---|---|
| committer | David Medina <davidmedina9@gmail.com> | 2012-05-12 23:08:55 +0200 |
| commit | 748b320dd244341694c0d247d04c7f57ad4c052e (patch) | |
| tree | 37b7ffad24d21f398dbb0592395b65599594c40b /pygithub3/core | |
| parent | New install environment to prod and dev (diff) | |
| parent | Some fixes/typos and 'validate_body' related (diff) | |
| download | python-github3-748b320dd244341694c0d247d04c7f57ad4c052e.tar.xz python-github3-748b320dd244341694c0d247d04c7f57ad4c052e.zip | |
Merge 'services/pull_requests'
Diffstat (limited to 'pygithub3/core')
| -rw-r--r-- | pygithub3/core/errors.py | 6 | ||||
| -rw-r--r-- | pygithub3/core/utils.py | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/pygithub3/core/errors.py b/pygithub3/core/errors.py index 4a95df0..9b84479 100644 --- a/pygithub3/core/errors.py +++ b/pygithub3/core/errors.py @@ -1,11 +1,7 @@ #!/usr/bin/env python # -*- encoding: utf-8 -*- -try: - import simplejson as json -except ImportError: - import json - +from pygithub3.core.utils import json from pygithub3.exceptions import NotFound, BadRequest, UnprocessableEntity diff --git a/pygithub3/core/utils.py b/pygithub3/core/utils.py index c6dbf0a..24a3bbf 100644 --- a/pygithub3/core/utils.py +++ b/pygithub3/core/utils.py @@ -2,6 +2,11 @@ # -*- encoding: utf-8 -*- """ Utils to support python 2.6 compatibility """ +try: + import simplejson as json +except ImportError: + import json + from collections import MutableMapping |