kallithea Changeset - 9d7f9914fa8c

Changeset - 9d7f9914fa8c

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Mads Kiilerich - 11 years ago 2015-01-06 00:54:36
madski@unity3d.com

json: always use kallithea.lib.compat for json - and nothing else

3 files changed with 3 insertions and 15 deletions:

kallithea/bin/base.py

kallithea/bin/ldap_sync.py

kallithea/lib/ext_json.py

0 comments (0 inline, 0 general)

kallithea/bin/base.py

➞

Show inline comments

@@ @@ -10,55 +10,49 @@ @@
 # GNU General Public License for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 kallithea.bin.base
 ~~~~~~~~~~~~~~~~~~
 Base utils for shell scripts
 This file was forked by the Kallithea project in July 2014.
 Original author and date, and relevant copyright and licensing information is below:
 :created_on: May 09, 2013
 :author: marcink
 :copyright: (c) 2013 RhodeCode GmbH, and others.
 :license: GPLv3, see LICENSE.md for more details.
 """
 import os
 import sys
 import random
 import urllib2
 import pprint
 try:
     from kallithea.lib.ext_json import json
 except ImportError:
     try:
         import simplejson as json
     except ImportError:
         import json
 from kallithea.lib.compat import json
 CONFIG_NAME = '.config/kallithea'
 FORMAT_PRETTY = 'pretty'
 FORMAT_JSON = 'json'
 def api_call(apikey, apihost, method=None, **kw):
     """
     Api_call wrapper for Kallithea.
     :param apikey:
     :param apihost:
     :param format: formatting, pretty means prints and pprint of json
      json returns unparsed json
     :param method:
     :returns: json response from server
     """
     def _build_data(random_id):
         """
         Builds API data with given random ID
         :param random_id:
         """
         return {

kallithea/bin/ldap_sync.py

➞

Show inline comments

@@ @@ -8,55 +8,49 @@ @@
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 kallithea.bin.__init__
 ~~~~~~~~~~~~~~~~~~~~~~
 LDAP sync script
 This file was forked by the Kallithea project in July 2014.
 Original author and date, and relevant copyright and licensing information is below:
 :created_on: Mar 06, 2013
 :author: marcink
 :copyright: (c) 2013 RhodeCode GmbH, and others.
 :license: GPLv3, see LICENSE.md for more details.
 """
 import ldap
 import urllib2
 import uuid
 try:
     from kallithea.lib.compat import json
 except ImportError:
     try:
         import simplejson as json
     except ImportError:
         import json
 from kallithea.lib.compat import json
 from ConfigParser import ConfigParser
 config = ConfigParser()
 config.read('ldap_sync.conf')
 class InvalidResponseIDError(Exception):
     """ Request and response don't have the same UUID. """
 class ResponseError(Exception):
     """ Response has an error, something went wrong with request execution. """
 class UserAlreadyInGroupError(Exception):
     """ User is already a member of the target group. """
 class UserNotInGroupError(Exception):
     """ User is not a member of the target group. """
 class API(object):

kallithea/lib/ext_json.py

➞

Show inline comments

 import datetime
 import functools
 import decimal
 import imp
-__all__ = ['json', 'simplejson', 'stdlibjson']
 __all__ = ['json']
 def _is_aware(value):
     """
     Determines if a given datetime.time is aware.
     The logic is described in Python's docs:
     http://docs.python.org/library/datetime.html#datetime.tzinfo
     """
     return (value.tzinfo is not None
             and value.tzinfo.utcoffset(value) is not None)
 def _obj_dump(obj):
     """
     Custom function for dumping objects to JSON, if obj has __json__ attribute
     or method defined it will be used for serialization
     :param obj:
     """
     if isinstance(obj, complex):
         return [obj.real, obj.imag]
     # See "Date Time String Format" in the ECMA-262 specification.

0 comments (0 inline, 0 general)