Python PGBouncer

Merge lp:~cjwatson/python-pgbouncer/py3 into lp:python-pgbouncer

  1. py3
  2. Merge into trunk
Proposed by Colin Watson
Status: Merged
Merged at revision: 15
Proposed branch: lp:~cjwatson/python-pgbouncer/py3
Merge into: lp:python-pgbouncer
Prerequisite: lp:~cjwatson/python-pgbouncer/tox
Diff against target: 65 lines (+7/-2)
5 files modified
.bzrignore (+1/-0)
NEWS.txt (+1/-0)
pgbouncer/fixture.py (+2/-2)
setup.py (+2/-0)
tox.ini (+1/-0)
To merge this branch: bzr merge lp:~cjwatson/python-pgbouncer/py3
Reviewer Review Type Date Requested Status
William Grant code Approve
Review via email: mp+368551@code.launchpad.net

Commit message

Add Python 3 support.

To post a comment you must log in.
Revision history for this message
William Grant (wgrant) :
review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.bzrignore'
2--- .bzrignore 2019-06-07 15:29:45 +0000
3+++ .bzrignore 2019-06-07 15:29:45 +0000
4@@ -1,5 +1,6 @@
5 ./.tox
6 ./MANIFEST
7 ./pgbouncer.egg-info
8+__pycache__
9 TAGS
10 tags
11
12=== modified file 'NEWS.txt'
13--- NEWS.txt 2019-06-07 15:29:45 +0000
14+++ NEWS.txt 2019-06-07 15:29:45 +0000
15@@ -3,6 +3,7 @@
16
17 - Use postgresfixture to test against multiple PostgreSQL versions.
18 - Switch to tox.
19+- Add Python 3 support.
20
21 0.0.8 (2012-08-20)
22 ==================
23
24=== modified file 'pgbouncer/fixture.py'
25--- pgbouncer/fixture.py 2012-08-13 20:53:04 +0000
26+++ pgbouncer/fixture.py 2019-06-07 15:29:45 +0000
27@@ -52,11 +52,11 @@
28 port, and the time it actually gets used), but for the purposes for which
29 this function gets used it isn't a problem in practice.
30 """
31- sockets = map(lambda _: socket.socket(), xrange(n))
32+ sockets = [socket.socket() for _ in range(n)]
33 try:
34 for s in sockets:
35 s.bind(('localhost', 0))
36- return map(lambda s: s.getsockname()[1], sockets)
37+ return [s.getsockname()[1] for s in sockets]
38 finally:
39 for s in sockets:
40 s.close()
41
42=== modified file 'setup.py'
43--- setup.py 2019-06-07 15:29:45 +0000
44+++ setup.py 2019-06-07 15:29:45 +0000
45@@ -37,6 +37,8 @@
46 'License :: OSI Approved :: GNU Affero General Public License v3',
47 'Operating System :: OS Independent',
48 'Programming Language :: Python',
49+ 'Programming Language :: Python :: 2',
50+ 'Programming Language :: Python :: 3',
51 ],
52 install_requires = [
53 'fixtures',
54
55=== modified file 'tox.ini'
56--- tox.ini 2019-06-07 15:29:45 +0000
57+++ tox.ini 2019-06-07 15:29:45 +0000
58@@ -1,6 +1,7 @@
59 [tox]
60 envlist =
61 py27
62+ py35
63
64 [testenv]
65 deps =

Subscribers

People subscribed via source and target branches

to status/vote changes: