New issue

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

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Python3 support for diesel 4 #100

Merged
merged 49 commits into from Apr 14, 2015

Conversation

Projects
None yet
2 participants
@touilleMan

touilleMan commented Apr 13, 2015

As discussed in #97 , Here is my pull request ;-)

touilleMan added some commits Mar 15, 2015

Merge branch 'py3k' into diesel4
Conflicts:
	diesel/__init__.py
	diesel/app.py
	diesel/client.py
	diesel/console.py
	diesel/convoy/__init__.py
	diesel/convoy/consensus/client.py
	diesel/convoy/consensus/server.py
	diesel/core.py
	diesel/protocols/dreadlock.py
	diesel/protocols/http/core.py
	diesel/protocols/http/pool.py
	diesel/protocols/mongodb.py
	diesel/protocols/pg.py
	diesel/protocols/redis.py
	diesel/protocols/riak.py
	diesel/protocols/websockets.py
	diesel/util/streams.py
	diesel/web.py
	examples/clocker.py
	examples/combined.py
	examples/combined_tls.py
	examples/consolechat.py
	examples/convoy.py
	examples/dreadlocks.py
	examples/zeromq_echo_service.py

dowski added a commit that referenced this pull request Apr 14, 2015

Merge pull request #100 from touilleMan/diesel4
Python3 support for diesel 4

@dowski dowski merged commit 76b6622 into dieseldev:diesel4 Apr 14, 2015

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
@dowski

This comment has been minimized.

Member

dowski commented Apr 14, 2015

Fantastic work! This is an excellent contribution for the project.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment