summaryrefslogtreecommitdiff
path: root/redis
Commit message (Collapse)AuthorAgeFilesLines
* encoding testsandy2013-06-062-9/+12
|
* Merge branch 'master' into pytestandy2013-06-043-1/+8
|\
| * Merge pull request #351 from yossigo/busy-loadingAndy McCurdy2013-06-043-1/+8
| |\ | | | | | | Add BusyLoadingError exception.
| | * BusyLoadingError should inherit ConnectionError.Yossi Gottlieb2013-06-041-1/+1
| | |
| | * Add BusyLoadingError exception to differentiate -LOADING errors from connect ↵Yossi Gottlieb2013-06-043-1/+8
| | | | | | | | | | | | errors.
* | | connection pool testsandy2013-06-041-0/+2
| | |
* | | Merge branch 'master' into pytestandy2013-06-041-0/+4
|\ \ \ | |/ / | | | | | | | | | Conflicts: tests/server_commands.py
| * | Add CONFIG RESETSTAT support.Yossi Gottlieb2013-06-041-0/+4
| |/
* | pytest framework and server commandsandy2013-06-041-27/+40
|/
* Merge branch 'master' of github.com:andymccurdy/redis-pyandy2013-05-231-1/+2
|\
| * pep8 complianceCarpentier Pierre-Francois2013-05-151-1/+1
| |
| * error in the __call__ method of class ScriptCarpentier Pierre-Francois2013-05-151-1/+2
| | | | | | | | | | | | | | If "client" is a pipeline, and this pipeline is empty, python converts "client" to False when casting in bool because Class BasePipeline has a method __len__. "client" is reset to self.registered_client, and the script is not executed in the pipeline as it should. The correct test is to check if "client" equals None. see http://stackoverflow.com/questions/100732/why-is-if-not-someobj-better-than-if-someobj-none-in-python for bool conversion (first answer).
* | use iterators for dict traversal in both python 2 and 3andy2013-05-232-7/+7
|/
* version 2.7.52.7.5andy2013-05-141-1/+1
|
* from_url supports URI without a port number, defaults to 6379Aaron Westendorf2013-05-101-1/+1
|
* can reuse the already existing parse_error routine to deal with LOADING errors.andy2013-05-061-6/+3
|
* DEL, HDEL, ZREM commands now return number of keys deleted. fixed #243andy2013-05-011-5/+6
|
* 2.7.42.7.4andy2013-04-281-1/+1
|
* Adding incrby aliasKrzysztof Dorosz2013-04-281-0/+10
|
* remove offending pep8 line, travis ci should pass nowandy2013-04-271-2/+0
|
* testing travis-ci pep8 integrationandy2013-04-271-0/+2
|
* pep8andy2013-04-273-56/+53
|
* Implement extended set options added in Redis 2.6.12.george yoshida2013-04-271-1/+0
| | | | - fix wording/formatting
* Implement extended set options added in Redis 2.6.12.george yoshida2013-04-271-1/+1
| | | | - support Python 3.x
* Implement extended set options added in Redis 2.6.12.george yoshida2013-04-271-4/+35
| | | | | | SPECS : - http://redis.io/commands/set - https://github.com/antirez/redis/issues/931
* 2.7.32.7.3andy2013-04-221-1/+1
|
* pep8andy2013-04-224-8/+8
|
* Merge branch 'mapleoin-master'andy2013-04-221-2/+26
|\
| * Merge branch 'master' of git://github.com/mapleoin/redis-py into mapleoin-masterandy2013-04-221-2/+26
| |\ | | | | | | | | | | | | Conflicts: redis/client.py
| | * use response callbacks for sort() with tuples to work with pipelinesIonuț Arțăriși2011-10-111-9/+18
| | |
| | * add an optional argument to sort to make it return tuplesIonuț Arțăriși2011-10-101-2/+17
| | |
* | | Merge pull request #338 from stephan-hof/corrupted_pipeline_socketAndy McCurdy2013-04-221-2/+9
|\ \ \ | | | | | | | | socket gets corrupted if errors in pipeline happen
| * | | Add python3 and python2.5 compatibilityhofmockel2013-04-191-2/+2
| | | |
| * | | Read all command responses of a pipelinehofmockel2013-04-171-2/+9
| | | | | | | | | | | | | | | | | | | | Otherwise a error makes the responses stuck in the socket. Which leads to wrong responses for the following commands
* | | | Merge pull request #327 from pabelanger/pep8Andy McCurdy2013-04-223-1/+10
|\ \ \ \ | |_|/ / |/| | | Format code per pep8 guidelines
| * | | Format code per pep8 guidelinesPaul Belanger2013-03-303-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | A simple patch to enable pep8 in tox and format our code properly. Signed-off-by: Paul Belanger <paul.belanger@polybeacon.com>
* | | | Merge pull request #340 from thruflo/masterAndy McCurdy2013-04-223-1/+191
|\ \ \ \ | | | | | | | | | | Add optional `redis.connection.BlockingConnectionPool` class.
| * | | | connection: fix py3 syntax bug.James Arthur2013-04-191-2/+2
| | | | |
| * | | | connection: remove stray print statement.James Arthur2013-04-191-1/+0
| | | | |
| * | | | compat: extract queue imports to _compat module.James Arthur2013-04-192-6/+29
| | | | | | | | | | | | | | | | | | | | Adds python 2.5 support for the LifoQueue structure.
| * | | | connection: add an optional `BlockingConnectionPool` class.James Arthur2013-04-182-0/+168
| | |/ / | |/| | | | | | | | | | | | | | | | | | * implements the same api as the default `ConnectionPool` * blocks for a specified timeout when getting a connection if no connections are available
* | | | math is hardandy2013-04-221-2/+2
| | | |
* | | | added PSETEXandy2013-04-221-8/+12
| | | |
* | | | Merge branch 'psetex' of git://github.com/yamt/redis-py into yamt-psetexandy2013-04-221-0/+7
|\ \ \ \ | |/ / / |/| | |
| * | | implement PSETEX commandyamamoto2012-10-311-0/+7
| | | |
* | | | Merge pull request #283 from salimane/upstreamAndy McCurdy2013-04-151-1/+1
|\ \ \ \ | | | | | | | | | | in _compat for py3k only encode if param is not bytes type in b()
| * | | | in _compat for py3k only encode if param is not bytes type in b()Salimane Adjao Moustapha2012-09-141-1/+1
| | | | |
* | | | | allow client.transaction() to return the value of func based on kwarg. fix ↵andy2013-04-151-2/+4
| | | | | | | | | | | | | | | | | | | | for #331
* | | | | Catch exception, not anything (which could be KeyboardInterrupt).Lucian Branescu Mihaila2013-04-102-7/+7
| |_|/ / |/| | |
* | | | Merge branch 'master' of git://github.com/mattrobenolt/redis-py into ↵andy2013-03-281-5/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mattrobenolt-master Conflicts: redis/exceptions.py