Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

api: Fix version number check. 

This fixes Trac #790.

(imported from commit 4bc82ac52298308bdb7d068ed6eee740e211aa56)
This commit is contained in:
Tim Abbott 2013-03-06 13:48:24 -05:00
parent acab720502
commit a64dd5a712
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
api/humbug/__init__.py
View File

@ -28,6 +28,7 @@ import urlparse
import sys import sys
import os import os
import optparse import optparse
from distutils.version import LooseVersion
from ConfigParser import SafeConfigParser from ConfigParser import SafeConfigParser
@ -36,7 +37,7 @@ __version__ = "0.1.4"
# Check that we have a recent enough version # Check that we have a recent enough version
# Older versions don't provide the 'json' attribute on responses. # Older versions don't provide the 'json' attribute on responses.
assert(requests.__version__ >= '0.12.1') assert(LooseVersion(requests.__version__) >= LooseVersion('0.12.1'))
# In newer versions, the 'json' attribute is a function, not a property # In newer versions, the 'json' attribute is a function, not a property
requests_json_is_function = not isinstance(requests.Response.json, property) requests_json_is_function = not isinstance(requests.Response.json, property)