mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-02-07 00:47:39 -08:00
56bd759df1
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
35 lines
1005 B
Diff
35 lines
1005 B
Diff
From 51f2470bce6c9e6067606aec2d9a018555582b30 Mon Sep 17 00:00:00 2001
|
|
From: MinRK <benjaminrk@gmail.com>
|
|
Date: Mon, 20 Aug 2012 22:44:27 -0700
|
|
Subject: [PATCH] fix exception syntax in gevent.core
|
|
|
|
---
|
|
zmq/green/core.py | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/zmq/green/core.py b/zmq/green/core.py
|
|
index d4e5f73..9e5acdf 100644
|
|
--- a/zmq/green/core.py
|
|
+++ b/zmq/green/core.py
|
|
@@ -114,7 +114,7 @@ def _wait_write(self):
|
|
try:
|
|
timeout.start()
|
|
self.__writable.get(block=True)
|
|
- except gevent.Timeout, t:
|
|
+ except gevent.Timeout as t:
|
|
if t is not timeout:
|
|
raise
|
|
toc = time.time()
|
|
@@ -138,7 +138,7 @@ def _wait_read(self):
|
|
try:
|
|
timeout.start()
|
|
self.__readable.get(block=True)
|
|
- except gevent.Timeout, t:
|
|
+ except gevent.Timeout as t:
|
|
if t is not timeout:
|
|
raise
|
|
toc = time.time()
|
|
--
|
|
1.7.10
|
|
|