Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

version 0.7 done

  • Loading branch information...
commit 3a810a17993868f183de3b7c3af77ed99b654a33 1 parent dcd71a4
@lsbardel authored
View
1  CHANGELOG.rst
@@ -3,6 +3,7 @@
Ver. 0.7.0 - 2012 Oct 25
===============================
* First official release of version 0.7.0. Requires redis_ 2.6 or above.
+* Supported python versions: 2.6, 2.7, 3.2, 3.3.
* Several fixes in documentation.
* Implemented :ref:`field lookups <field-lookups>` ``gt``, ``gt``, ``lt`` and ``le``.
* Added a *prefixed* redis client in :class:`stdnet.lib.redis.PrefixedRedis`.
View
7 docs/source/examples/query.rst
@@ -67,14 +67,11 @@ Concatenating
You can perform further selection by concatenating queries::
- qs = Instrument.objects.filter(ccy=('EUR','USD')).filter(types=('equity',bond'))
-<<<<<<< HEAD
-=======
+ qs = Instrument.objects.filter(ccy=('EUR','USD')).filter(types=('equity',bond'))
or equivalently::
- qs = Instrument.objects.filter(ccy=('EUR','USD'), types=('equity',bond'))
->>>>>>> 957ef07054e50920fd1640f16274e098683d3381
+ qs = Instrument.objects.filter(ccy=('EUR','USD'), types=('equity',bond'))
Which is equivalent to an intersection of two filter statement::
View
2  docs/source/index.rst
@@ -20,8 +20,6 @@ there are over 600 tests with a coverage over 90%.
**Dependencies**: None
-**Optional Dependencies**: cython_ for the :ref:`Redis C parser <redis-parser>`.
-
.. _contents:
Contents
View
36 setup.py
@@ -5,6 +5,7 @@
import os
import sys
+with_extensions = False
package_name = 'stdnet'
package_fullname = 'python-%s' % package_name
root_dir = os.path.split(os.path.abspath(__file__))[0]
@@ -82,7 +83,7 @@ def get_rel_dir(d,base,res=''):
file_info[0] = '\\PURELIB\\%s' % file_info[0]
-def run_setup(with_cext):
+def run_setup(with_cext=False):
if with_cext:
params = libparams
else:
@@ -111,21 +112,24 @@ def status_msgs(*msgs):
print(msg)
print('*' * 75)
-try:
- run_setup(True)
-except BuildFailed as exc:
- status_msgs(
- exc.msg,
+if with_extensions:
+ try:
+ run_setup(True)
+ except BuildFailed as exc:
+ status_msgs(
+ exc.msg,
+ "WARNING: The C extension could not be compiled, " +
+ "speedups are not enabled.",
+ "Failure information, if any, is above.",
+ "Retrying the build without the C extension now."
+ )
+
+ run_setup()
+
+ status_msgs(
"WARNING: The C extension could not be compiled, " +
"speedups are not enabled.",
- "Failure information, if any, is above.",
- "Retrying the build without the C extension now."
+ "Plain-Python build succeeded."
)
-
- run_setup(False)
-
- status_msgs(
- "WARNING: The C extension could not be compiled, " +
- "speedups are not enabled.",
- "Plain-Python build succeeded."
- )
+else:
+ run_setup()
View
2  stdnet/__init__.py
@@ -29,4 +29,4 @@
'Topic :: Internet'
]
-sphinxtogithub = False
+sphinxtogithub = True
View
8 stdnet/lib/__init__.py
@@ -1,10 +1,8 @@
try:
- from . import hr
- hasextensions = True
+ import hiredis
except:
- hasextensions = False
- hr = None
-
+ hiredis = None
+hiredis = None
from . import fallback
skiplist = fallback.skiplist
zset = fallback.zset
View
6 stdnet/lib/redis/connection.py
@@ -44,7 +44,7 @@
from stdnet import BackendRequest
from stdnet.conf import settings
from stdnet.utils import iteritems, map, ispy3k, range, to_string
-from stdnet.lib import hr, fallback
+from stdnet.lib import hiredis, fallback
from stdnet.utils.dispatch import Signal
from .exceptions import *
@@ -67,8 +67,8 @@
PyRedisReader = lambda : fallback.RedisReader(RedisProtocolError,
RedisInvalidResponse)
-if hr: #pragma nocover
- RedisReader = lambda : hr.RedisReader(RedisProtocolError,
+if hiredis: #pragma nocover
+ RedisReader = lambda : hiredis.Reader(RedisProtocolError,
RedisInvalidResponse)
else: #pragma nocover
RedisReader = PyRedisReader
Please sign in to comment.
Something went wrong with that request. Please try again.