Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Already on GitHub? Sign in to your account

CA-116369: Fix compatibility problem with Python 2.6 #1522

Merged
merged 1 commit into from Oct 30, 2013

Conversation

Projects
None yet
3 participants
Contributor

mcclurmc commented Oct 23, 2013

In Python 2.6 socket.error class inherit from IOError. For this reason
checking for socket.error exception after IOError cause the catch path to
never get taken. Fix this problem checking for socket.error before IOError.

Signed-off-by: Frediano Ziglio frediano.ziglio@citrix.com

@freddy77 freddy77 CA-116369: Fix compatibility problem with Python 2.6
In Python 2.6 socket.error class inherit from IOError. For this reason
checking for socket.error exception after IOError cause the catch path to
never get taken. Fix this problem checking for socket.error before IOError.

Signed-off-by: Frediano Ziglio <frediano.ziglio@citrix.com>
0ed8a8f
Contributor

freddy77 commented Oct 28, 2013

Why this was not merged ??

Contributor

freddy77 commented Oct 30, 2013

Ping.

Owner

jonludlam commented Oct 30, 2013

Just an oversight. Merging now.

@jonludlam jonludlam added a commit that referenced this pull request Oct 30, 2013

@jonludlam jonludlam Merge pull request #1522 from mcclurmc/ca116369-perfmon
CA-116369: Fix compatibility problem with Python 2.6
fc961fa

@jonludlam jonludlam merged commit fc961fa into xapi-project:master Oct 30, 2013

1 check passed

default Merged build finished.
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment