~bzr-pqm/bzr/bzr.dev

Committer: Patch Queue Manager
Date: 2012-01-24 10:22:58 UTC
mfrom: (6437.13.1 2.5_trivial_no_pypy_fsenc)
mto: (6445.1.1 trunk) (6437.24.1 2.5.0-dev) (6159.2.5 bzr) (6450.1.1 bzr.dev) (6457.1.1 trunk) (6461.1.1 trunk) (6468.1.1 merge-2.5) (6093.4.72 translations) (6472.1.1 merge-2.5) (6474.1.1 trunk) (6476.1.1 dev_2.5_integration) (6492.1.1 trunk) (6498.1.1 trunk) (6507.1.1 trunk) (6524.1.1 bzr.dev) (6531.1.1 merge-2.5) (6548.1.1 trunk) (6549.3.1 dev_2.5_integration) (6562.1.1 2.6-merge-up-2.5) (6574.1.1 integration) (6576.1.4 trunk) (6578.1.1 2.6-merges-2.5)
mto: This revision was merged to the branch mainline in revision 6446.
Revision ID: pqm@pqm.ubuntu.com-20120124102258-dz7syv2g62srmnpr

(jelmer) Correct detection of Python implementations that don't support the
C api when patching the default filesystem encoding. (Martin Packman)

added added

removed removed

148

"""

149

try:

150

import ctypes

151

except ImportError:

152

return

153

pythonapi = getattr(ctypes, "pythonapi", None)

154

if pythonapi is None:

155

# Not CPython ctypes implementation

156

return

157

old_ptr = ctypes.c_void_p.in_dll(pythonapi, "Py_FileSystemDefaultEncoding")

151

old_ptr = ctypes.c_void_p.in_dll(ctypes.pythonapi,

152

"Py_FileSystemDefaultEncoding")

153

except (ImportError, ValueError):

154

return # No ctypes or not CPython implementation, do nothing

158

155

new_ptr = ctypes.cast(ctypes.c_char_p(intern(new_enc)), ctypes.c_void_p)

159

156

old_ptr.value = new_ptr.value

160

157

if sys.getfilesystemencoding() != new_enc: