← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~cjwatson/python-oops-datedir2amqp/py3 into lp:python-oops-datedir2amqp

 

Colin Watson has proposed merging lp:~cjwatson/python-oops-datedir2amqp/py3 into lp:python-oops-datedir2amqp.

Commit message:
Add Python 3 support.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/python-oops-datedir2amqp/py3/+merge/397356
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~cjwatson/python-oops-datedir2amqp/py3 into lp:python-oops-datedir2amqp.
=== modified file '.bzrignore'
--- .bzrignore	2011-11-03 10:10:10 +0000
+++ .bzrignore	2021-02-02 14:31:30 +0000
@@ -8,3 +8,5 @@
 ./download-cache
 ./dist
 ./MANIFEST
+./.tox
+__pycache__

=== modified file 'NEWS'
--- NEWS	2021-02-01 12:53:06 +0000
+++ NEWS	2021-02-02 14:31:30 +0000
@@ -8,6 +8,7 @@
 
 * Port from amqplib to amqp. (Colin Watson)
 * Switch from buildout to tox. (Colin Watson)
+* Add Python 3 support. (Colin Watson)
 
 0.0.4
 -----

=== modified file 'setup.py'
--- setup.py	2021-02-01 12:46:10 +0000
+++ setup.py	2021-02-02 14:31:30 +0000
@@ -19,8 +19,8 @@
 from distutils.core import setup
 import os.path
 
-description = file(
-        os.path.join(os.path.dirname(__file__), 'README'), 'rb').read()
+with open(os.path.join(os.path.dirname(__file__), 'README')) as f:
+    description = f.read()
 
 setup(name="oops_datedir2amqp",
       version="0.0.5",

=== modified file 'tox.ini'
--- tox.ini	2021-02-01 12:53:06 +0000
+++ tox.ini	2021-02-02 14:31:30 +0000
@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    py27
+    py27,py35,py36,py37,py38,py39
 
 [testenv]
 commands =