Python3 - re-apply on top of Ormod - #419

Closed

redref wants to merge 41 commits into

python-diamond:masterfrom

redref:python3

Commits on Aug 26, 2015

py3k: change all print statements to be functions
Ormod
committed
c79867b
py3k: Change exception syntax from old style commas to use the as syntax
Ormod
committed
652331e
tests: import Mock and patch from the test base file
Ormod
committed
6909cab
py3k: add a pycompat helper file for imports
Ormod
committed
8861084
tests: import exception types through a relative import
Ormod
committed
4f7ace9
py3k: replace all dict.iteritems() with .items()
Ormod
committed
451f4d7
test: make filter iterators into lists for py3k compatibility
Ormod
committed
1b5ea97
py3k: replace xrange with range for compatibility
Ormod
committed
4aba7e6
py3k: Replace all uses of basestring with isinstance(x, str)
Ormod
committed
d37d447
py3k: use string.ascii_letters since it also exists in py3k
Ormod
committed
80338fb
py3k: Replace the obsolete use of string.replace with .replace()
Ormod
committed
289553d
py3k: Replace some more uses of call and magicmock from the one in base test
Ormod
committed
ad04027
tests: import StringIO from the base test file
Ormod
committed
f4fd5ac
py3k: Change tests mock patching to use a variable from test base file
Ormod
committed
ad53be5
py3k: import urllib from a common pycompat file
Ormod
committed
494eb69
py3k: Fix cpickle import to have a fallback
Ormod
committed
7a9e91e
py3k: import Queue related functionality from pycompat
Ormod
committed
86dd286
py3k: Move http client to a file with a different name to unmask the import on py3k
Ormod
committed
5842b2b
py3k: Change xmlrpclib imports to work with both py3k and 2.x
Ormod
committed
1011b17
py3k: Since py3k no longer has a long type, mock int as its replacement
Ormod
committed
00b1b09
py3k: subprocess returns bytes not strings on py3k, convert to unicode
Ormod
committed
453fca5
py3k: Use list comprehensions and add a few required list()'s over iterators
Ormod
committed
e45cc5f
py3k: Fix test class to work with different type of __next__/next methods
Ormod
committed
e7c68fa
py3k: Makefile/setup.py changes to support building both py2.x and py3k
Ormod
committed
7c70c38
Makefile: get distribution name by asking python itself
Ormod
committed
4f1793d
pep8: Fix pep8 issues created during py3k work
Ormod
committed
678960a
py3k: Replace file() calls with open()
Ormod
committed
77066b5
py3k: Change imports to be relative imports for Handlers
Ormod
committed
2c263aa

Commits on Feb 28, 2016

Fix handlers/collectors import to manage duplicate names
redref
committed
603332a
ElasticsearchHandler - compatible with Grafana
redref
committed
6c25470

Commits on Mar 1, 2016

Merge branch 'master' of https://github.com/python-diamond/Diamond into events
redref
committed
5539d0f

Commits on Mar 4, 2016

Merge branch 'py3k' of https://github.com/Ormod/Diamond into py3k
redref
committed
171e4fe

Commits on Mar 5, 2016

Makefile : python to distrib python
redref
committed
3c223af
py3k: apply pycompat / py3k syntax
redref
committed
0ebf4ac
py3k: fix collectors syntax
redref
committed
330f7e4
pep8: space in diamond-setup
redref
committed
ae8d3aa
KafkaCollector: rework / fix test
redref
committed
3349d71
py3k: fix dependencies - travis requirements
redref
committed
4c4c134
py3k: long to int
redref
committed
d6ca9f5
Makefile: call $PYTHON everywhere
redref
committed
da03a2c

Commits on Mar 7, 2016

py3k: add six (integer_types, string_types, moves.range)
redref
committed
c0f0e84