1
=== modified file 'txfixtures/osutils.py'
2
--- txfixtures/osutils.py	2011-12-01 21:09:30 +0000
3
+++ txfixtures/osutils.py	2016-01-29 01:44:03 +0000
4
@@ -20,7 +20,7 @@
5
20
    """Kill a pid accepting that it may not exist."""
20
    """Kill a pid accepting that it may not exist."""
6
21
    try:
21
    try:
7
22
        os.kill(pid, signal_number)
22
        os.kill(pid, signal_number)
9
23
    except OSError, e:
23
    except OSError as e:
10
24
        if e.errno in (errno.ESRCH, errno.ECHILD):
24
        if e.errno in (errno.ESRCH, errno.ECHILD):
11
25
            # Process has already been killed.
25
            # Process has already been killed.
12
26
            return
26
            return
13
@@ -62,7 +62,7 @@
14
62
            if new_pid:
62
            if new_pid:
15
63
                return result
63
                return result
16
64
            time.sleep(poll_interval)
64
            time.sleep(poll_interval)
18
65
        except OSError, e:
65
        except OSError as e:
19
66
            if e.errno in (errno.ESRCH, errno.ECHILD):
66
            if e.errno in (errno.ESRCH, errno.ECHILD):
20
67
                # Raised if the process is gone by the time we try to get the
67
                # Raised if the process is gone by the time we try to get the
21
68
                # return value.
68
                # return value.
22
@@ -90,7 +90,7 @@
23
90
    """Remove the given file if it exists."""
90
    """Remove the given file if it exists."""
24
91
    try:
91
    try:
25
92
        os.remove(path)
92
        os.remove(path)
27
93
    except OSError, e:
93
    except OSError as e:
28
94
        if e.errno != errno.ENOENT:
94
        if e.errno != errno.ENOENT:
29
95
            raise
95
            raise
30
96
96
31
@@ -109,11 +109,11 @@
32
109
    for i in range(retries):
109
    for i in range(retries):
33
110
        try:
110
        try:
34
111
            return function(*args, **kwargs)
111
            return function(*args, **kwargs)
36
112
        except (IOError, OSError), e:
112
        except (IOError, OSError) as e:
37
113
            if e.errno == errno.EINTR:
113
            if e.errno == errno.EINTR:
38
114
                continue
114
                continue
39
115
            raise
115
            raise
41
116
        except socket.error, e:
116
        except socket.error as e:
42
117
            # In Python 2.6 we can use IOError instead.  It also has
117
            # In Python 2.6 we can use IOError instead.  It also has
43
118
            # reason.errno but we might be using 2.5 here so use the
118
            # reason.errno but we might be using 2.5 here so use the
44
119
            # index hack.
119
            # index hack.
45
120
120
46
=== modified file 'txfixtures/tachandler.py'
47
--- txfixtures/tachandler.py	2011-12-01 21:38:07 +0000
48
+++ txfixtures/tachandler.py	2016-01-29 01:44:03 +0000
49
@@ -135,7 +135,7 @@
50
135
            s.connect((host, port))
135
            s.connect((host, port))
51
136
            s.close()
136
            s.close()
52
137
            return True
137
            return True
54
138
        except socket.error, e:
138
        except socket.error as e:
55
139
            if e.errno == errno.ECONNREFUSED:
139
            if e.errno == errno.ECONNREFUSED:
56
140
                return False
140
                return False
57
141
            else:
141
            else:
58
142
142
59
=== modified file 'txfixtures/tests/test_tachandler.py'
60
--- txfixtures/tests/test_tachandler.py	2011-11-04 07:53:26 +0000
61
+++ txfixtures/tests/test_tachandler.py	2016-01-29 01:44:03 +0000
62
@@ -126,7 +126,7 @@
63
126
126
64
127
        # Put the (now bogus) pid in the pid file.
127
        # Put the (now bogus) pid in the pid file.
65
128
        with open(fixture.pidfile, "wb") as pidfile:
128
        with open(fixture.pidfile, "wb") as pidfile:
67
129
            pidfile.write(str(process.pid))
129
            pidfile.write(str(process.pid).encode())
68
130
130
69
131
        # Fire up the fixture, capturing warnings.
131
        # Fire up the fixture, capturing warnings.
70
132
        with warnings.catch_warnings(record=True) as warnings_log:
132
        with warnings.catch_warnings(record=True) as warnings_log:
Status:	Work in progress
Proposed branch:	lp:~thomir-deactivatedaccount/txfixtures/trunk-py3
Merge into:	lp:~canonical-launchpad-branches/txfixtures/trunk
Diff against target:	70 lines (+7/-7) 3 files modified txfixtures/osutils.py (+5/-5) txfixtures/tachandler.py (+1/-1) txfixtures/tests/test_tachandler.py (+1/-1)
To merge this branch:	bzr merge lp:~thomir-deactivatedaccount/txfixtures/trunk-py3
Related bugs:	Link a bug report
Reviewer	Date Requested	Status
Thomi Richards (community)		Disapprove on 2016-01-29
Launchpad code reviewers	2016-01-29	Pending
Review via email: mp+284377@code.launchpad.net
1	=== modified file 'txfixtures/osutils.py'
2	--- txfixtures/osutils.py 2011-12-01 21:09:30 +0000
3	+++ txfixtures/osutils.py 2016-01-29 01:44:03 +0000
4	@@ -20,7 +20,7 @@
5	20	"""Kill a pid accepting that it may not exist."""	20	"""Kill a pid accepting that it may not exist."""
6	21	try:	21	try:
7	22	os.kill(pid, signal_number)	22	os.kill(pid, signal_number)
9	23	except OSError, e:	23	except OSError as e:
10	24	if e.errno in (errno.ESRCH, errno.ECHILD):	24	if e.errno in (errno.ESRCH, errno.ECHILD):
11	25	# Process has already been killed.	25	# Process has already been killed.
12	26	return	26	return
13	@@ -62,7 +62,7 @@
14	62	if new_pid:	62	if new_pid:
15	63	return result	63	return result
16	64	time.sleep(poll_interval)	64	time.sleep(poll_interval)
18	65	except OSError, e:	65	except OSError as e:
19	66	if e.errno in (errno.ESRCH, errno.ECHILD):	66	if e.errno in (errno.ESRCH, errno.ECHILD):
20	67	# Raised if the process is gone by the time we try to get the	67	# Raised if the process is gone by the time we try to get the
21	68	# return value.	68	# return value.
22	@@ -90,7 +90,7 @@
23	90	"""Remove the given file if it exists."""	90	"""Remove the given file if it exists."""
24	91	try:	91	try:
25	92	os.remove(path)	92	os.remove(path)
27	93	except OSError, e:	93	except OSError as e:
28	94	if e.errno != errno.ENOENT:	94	if e.errno != errno.ENOENT:
29	95	raise	95	raise
30	96		96
31	@@ -109,11 +109,11 @@
32	109	for i in range(retries):	109	for i in range(retries):
33	110	try:	110	try:
34	111	return function(args, *kwargs)	111	return function(args, *kwargs)
36	112	except (IOError, OSError), e:	112	except (IOError, OSError) as e:
37	113	if e.errno == errno.EINTR:	113	if e.errno == errno.EINTR:
38	114	continue	114	continue
39	115	raise	115	raise
41	116	except socket.error, e:	116	except socket.error as e:
42	117	# In Python 2.6 we can use IOError instead. It also has	117	# In Python 2.6 we can use IOError instead. It also has
43	118	# reason.errno but we might be using 2.5 here so use the	118	# reason.errno but we might be using 2.5 here so use the
44	119	# index hack.	119	# index hack.
45	120		120
46	=== modified file 'txfixtures/tachandler.py'
47	--- txfixtures/tachandler.py 2011-12-01 21:38:07 +0000
48	+++ txfixtures/tachandler.py 2016-01-29 01:44:03 +0000
49	@@ -135,7 +135,7 @@
50	135	s.connect((host, port))	135	s.connect((host, port))
51	136	s.close()	136	s.close()
52	137	return True	137	return True
54	138	except socket.error, e:	138	except socket.error as e:
55	139	if e.errno == errno.ECONNREFUSED:	139	if e.errno == errno.ECONNREFUSED:
56	140	return False	140	return False
57	141	else:	141	else:
58	142		142
59	=== modified file 'txfixtures/tests/test_tachandler.py'
60	--- txfixtures/tests/test_tachandler.py 2011-11-04 07:53:26 +0000
61	+++ txfixtures/tests/test_tachandler.py 2016-01-29 01:44:03 +0000
62	@@ -126,7 +126,7 @@
63	126		126
64	127	# Put the (now bogus) pid in the pid file.	127	# Put the (now bogus) pid in the pid file.
65	128	with open(fixture.pidfile, "wb") as pidfile:	128	with open(fixture.pidfile, "wb") as pidfile:
67	129	pidfile.write(str(process.pid))	129	pidfile.write(str(process.pid).encode())
68	130		130
69	131	# Fire up the fixture, capturing warnings.	131	# Fire up the fixture, capturing warnings.
70	132	with warnings.catch_warnings(record=True) as warnings_log:	132	with warnings.catch_warnings(record=True) as warnings_log: