##// END OF EJS Templates
depdendencies: bumped pycurl to 7.43.0.2
marcink -
r2942:7774a1bb default
parent child Browse files
Show More
@@ -1251,11 +1251,11 b' self: super: {'
1251 };
1251 };
1252 };
1252 };
1253 "pycurl" = super.buildPythonPackage {
1253 "pycurl" = super.buildPythonPackage {
1254 name = "pycurl-7.19.5";
1254 name = "pycurl-7.43.0.2";
1255 doCheck = false;
1255 doCheck = false;
1256 src = fetchurl {
1256 src = fetchurl {
1257 url = "https://files.pythonhosted.org/packages/6c/48/13bad289ef6f4869b1d8fc11ae54de8cfb3cc4a2eb9f7419c506f763be46/pycurl-7.19.5.tar.gz";
1257 url = "https://files.pythonhosted.org/packages/e8/e4/0dbb8735407189f00b33d84122b9be52c790c7c3b25286826f4e1bdb7bde/pycurl-7.43.0.2.tar.gz";
1258 sha256 = "0hqsap82zklhi5fxhc69kxrwzb0g9566f7sdpz7f9gyxkmyam839";
1258 sha256 = "1915kb04k1j4y6k1dx1sgnbddxrl9r1n4q928if2lkrdm73xy30g";
1259 };
1259 };
1260 meta = {
1260 meta = {
1261 license = [ pkgs.lib.licenses.mit { fullName = "LGPL/MIT"; } { fullName = "GNU Library or Lesser General Public License (LGPL)"; } ];
1261 license = [ pkgs.lib.licenses.mit { fullName = "LGPL/MIT"; } { fullName = "GNU Library or Lesser General Public License (LGPL)"; } ];
@@ -48,5 +48,6 b' pkgs.stdenv.mkDerivation {'
48 echo "Starting Generate Shell"
48 echo "Starting Generate Shell"
49 # Custom prompt to distinguish from other dev envs.
49 # Custom prompt to distinguish from other dev envs.
50 export PS1="\n\[\033[1;32m\][Generate-shell:\w]$\[\033[0m\] "
50 export PS1="\n\[\033[1;32m\][Generate-shell:\w]$\[\033[0m\] "
51 export PYCURL_SSL_LIBRARY=openssl
51 '';
52 '';
52 }
53 }
@@ -50,7 +50,7 b' psutil==5.4.6'
50 psycopg2==2.7.4
50 psycopg2==2.7.4
51 py-bcrypt==0.4
51 py-bcrypt==0.4
52 pycrypto==2.6.1
52 pycrypto==2.6.1
53 pycurl==7.19.5
53 pycurl==7.43.0.2
54 pyflakes==0.8.1
54 pyflakes==0.8.1
55 pygments-markdown-lexer==0.1.0.dev39
55 pygments-markdown-lexer==0.1.0.dev39
56 pygments==2.2.0
56 pygments==2.2.0
@@ -139,7 +139,7 b' class GeventCurlMulti(object):'
139 while True:
139 while True:
140 try:
140 try:
141 ret, num_handles = self._curl_multi.socket_action(fd, action)
141 ret, num_handles = self._curl_multi.socket_action(fd, action)
142 except pycurl.error, e:
142 except pycurl.error as e:
143 ret = e.args[0]
143 ret = e.args[0]
144 if ret != pycurl.E_CALL_MULTI_PERFORM:
144 if ret != pycurl.E_CALL_MULTI_PERFORM:
145 break
145 break
@@ -156,7 +156,7 b' class GeventCurlMulti(object):'
156 try:
156 try:
157 ret, num_handles = self._curl_multi.socket_action(
157 ret, num_handles = self._curl_multi.socket_action(
158 pycurl.SOCKET_TIMEOUT, 0)
158 pycurl.SOCKET_TIMEOUT, 0)
159 except pycurl.error, e:
159 except pycurl.error as e:
160 ret = e.args[0]
160 ret = e.args[0]
161 if ret != pycurl.E_CALL_MULTI_PERFORM:
161 if ret != pycurl.E_CALL_MULTI_PERFORM:
162 break
162 break
@@ -233,12 +233,13 b' class GeventCurl(object):'
233 waiter = self._curl.waiter = Waiter()
233 waiter = self._curl.waiter = Waiter()
234 try:
234 try:
235 self._multi.add_handle(self._curl)
235 self._multi.add_handle(self._curl)
236 response = waiter.get()
236 try:
237 return waiter.get()
237 finally:
238 finally:
238 self._multi.remove_handle(self._curl)
239 self._multi.remove_handle(self._curl)
240 finally:
239 del self._curl.waiter
241 del self._curl.waiter
240
242
241 return response
242
243
243 # Curl is originally imported from pycurl. At this point we override it with
244 # Curl is originally imported from pycurl. At this point we override it with
244 # our custom implementation.
245 # our custom implementation.
General Comments 0
You need to be logged in to leave comments. Login now