summaryrefslogtreecommitdiff
path: root/dbus
diff options
context:
space:
mode:
authorBarry Warsaw <barry@python.org>2011-12-15 16:50:02 -0500
committerBarry Warsaw <barry@python.org>2011-12-15 16:50:02 -0500
commitf2909c23abc4f8fa55d71673785f8e70a843f6ce (patch)
tree97adb74ab2ae9f262cd6ad11e049e50c86f1f178 /dbus
parent4c1c2eade1c5b383adad94a7a4fd6553873fecf0 (diff)
- Added back the missing PY3PORT.rst file, with updates.
- Disallow appending unicode objects with 'y' (bytes) signatures. This now requires either a bytes object or an integer. Update the tests to reflect - this change. - Fix broken __all__ in Python 3.
Diffstat (limited to 'dbus')
-rw-r--r--dbus/types.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/dbus/types.py b/dbus/types.py
index a134495..c33acff 100644
--- a/dbus/types.py
+++ b/dbus/types.py
@@ -1,7 +1,7 @@
-__all__ = ('ObjectPath', 'ByteArray', 'Signature', 'Byte', 'Boolean',
+__all__ = ['ObjectPath', 'ByteArray', 'Signature', 'Byte', 'Boolean',
'Int16', 'UInt16', 'Int32', 'UInt32', 'Int64', 'UInt64',
'Double', 'String', 'Array', 'Struct', 'Dictionary',
- 'UTF8String', 'UnixFd')
+ 'UnixFd']
from _dbus_bindings import (
Array, Boolean, Byte, ByteArray, Dictionary, Double, Int16, Int32, Int64,
@@ -11,3 +11,4 @@ from _dbus_bindings import (
from dbus._compat import is_py2
if is_py2:
from _dbus_bindings import UTF8String
+ __all__.append('UTF8String')