Skip to content
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

Ported to python 3, compatible with python 2 #41

Open
wants to merge 24 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
5d8b31a
fixed many syntax & reference errors; broke compatibility with python…
simonzack Jan 23, 2015
163c41b
hashing doesn't work here, since strings & bytes hash to the same val…
simonzack Jan 22, 2015
c7aa208
fixed next issues
simonzack Jan 23, 2015
7e96377
fixed bool issues
simonzack Jan 23, 2015
275fdad
more portable dict check
simonzack Jan 22, 2015
ff0dd2d
use sorted
simonzack Jan 22, 2015
fa9785f
fixed encoding issues
simonzack Jan 22, 2015
0932f31
use __eq__ instead
simonzack Jan 22, 2015
b15041f
fixed _join
simonzack Jan 23, 2015
06b98bc
type fixes, everything is an object in python
simonzack Jan 23, 2015
11894e6
more type fixes
simonzack Jan 23, 2015
13d7422
use unittest.TestCase instead as the name of the builtins module diff…
simonzack Jan 23, 2015
bbbb38d
store exc_info as it will change on the second sys.exc_info() invocat…
simonzack Jan 23, 2015
9a50898
convert to a local variable
simonzack Jan 23, 2015
2c5fe67
convert to list first
simonzack Jan 23, 2015
f01e6e7
use ModuleType instead
simonzack Jan 23, 2015
5f5dfe9
use `.data` instead
simonzack Jan 23, 2015
771fff1
use the `'b'` array type for testing
simonzack Jan 23, 2015
9aa1210
check whether the class is a classic class, i.e. if we are in python 2
simonzack Jan 23, 2015
045968e
fix python 3 `datetime.utcfromtimestamp` microsecond rounding
simonzack Jan 23, 2015
534bfda
sort object keys so encoding is deterministic, and so tests always pass
simonzack Jan 23, 2015
3e30198
skip classic tests on python 3
simonzack Jan 23, 2015
a4805e5
fixed repr issues
simonzack Jan 23, 2015
3992abb
Merge branch 'master' into python3
simonzack Jan 23, 2015
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
more portable dict check
simonzack committed Jan 23, 2015

Verified

This commit was signed with the committer’s verified signature.
MichaelDeBoey Michaël De Boey
commit 275fdadf06c3b352be9c5b74004b24389528a31e
2 changes: 1 addition & 1 deletion pyamf/remoting/gateway/__init__.py
Original file line number Diff line number Diff line change
@@ -277,7 +277,7 @@ def __init__(self, services=None, **kwargs):
if services is None:
services = {}

if not hasattr(services, 'iteritems'):
if not hasattr(services, 'items'):
raise TypeError("dict type required for services")

self.services = ServiceCollection()