[Erp5-report] r39555 kazuhiko - /erp5/trunk/products/ERP5Type/patches/memcache_client.py
nobody at svn.erp5.org
nobody at svn.erp5.org
Wed Oct 27 11:12:11 CEST 2010
Author: kazuhiko
Date: Wed Oct 27 11:12:08 2010
New Revision: 39555
URL: http://svn.erp5.org?rev=39555&view=rev
Log:
the original code uses 4-spaces tab.
Modified:
erp5/trunk/products/ERP5Type/patches/memcache_client.py
Modified: erp5/trunk/products/ERP5Type/patches/memcache_client.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/patches/memcache_client.py?rev=39555&r1=39554&r2=39555&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/patches/memcache_client.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/patches/memcache_client.py [utf8] Wed Oct 27 11:12:08 2010
@@ -1,27 +1,27 @@
# -*- coding: utf-8 -*-
# Code based on python-memcached-1.45
try:
- import memcache
+ import memcache
except ImportError:
- pass
+ pass
else:
- memcache._Host._SOCKET_TIMEOUT = 10 # wait more than 3s is safe
- # always return string
- # https://bugs.launchpad.net/python-memcached/+bug/509712
- def readline(self):
- buf = self.buffer
- recv = self.socket.recv
- while True:
- index = buf.find('\r\n')
- if index >= 0:
- break
- data = recv(4096)
- if not data:
- self.mark_dead('Connection closed while reading from %s'
- % repr(self))
- self.buffer = ''
- return '' #None
- buf += data
- self.buffer = buf[index+2:]
- return buf[:index]
- memcache._Host.readline = readline
+ memcache._Host._SOCKET_TIMEOUT = 10 # wait more than 3s is safe
+ # always return string
+ # https://bugs.launchpad.net/python-memcached/+bug/509712
+ def readline(self):
+ buf = self.buffer
+ recv = self.socket.recv
+ while True:
+ index = buf.find('\r\n')
+ if index >= 0:
+ break
+ data = recv(4096)
+ if not data:
+ self.mark_dead('Connection closed while reading from %s'
+ % repr(self))
+ self.buffer = ''
+ return '' #None
+ buf += data
+ self.buffer = buf[index+2:]
+ return buf[:index]
+ memcache._Host.readline = readline
More information about the Erp5-report
mailing list