Commit 51d42e77 authored by Hans Wennborg's avatar Hans Wennborg
Browse files

Merging r292247: 

------------------------------------------------------------------------
r292247 | jbcoe | 2017-01-17 12:03:54 -0800 (Tue, 17 Jan 2017) | 14 lines

Fix Python 3 language issues and add an explicit check for Python version == 2.

Summary:
Python bindings cannot support Python 3 without work being done to fix Unicode c-string conversion.

This was attempted in https://reviews.llvm.org/D26082. That patch was reverted due to memory access issues on Linux.

This revision fixes enough language compatibility issues for the clang module to be loaded and raise an error if the Python version is not 2.

Reviewers: mgorny, MathieuDuponchelle, rengolin, compnerd

Reviewed By: compnerd

Differential Revision: https://reviews.llvm.org/D28682
------------------------------------------------------------------------

llvm-svn: 292339
parent 7dc1f858

clang/bindings/python/clang/__init__.py

+8 −0
Original line number Diff line number Diff line
@@ -20,5 +20,13 @@ The available modules are: 
    Bindings for the Clang indexing library.

"""





# Python 3 uses unicode for strings. The bindings, in particular the interaction

# with ctypes, need modifying to handle conversions between unicode and

# c-strings.

import sys 

if sys.version_info[0] != 2: 

    raise Exception("Only Python 2 is supported.")



__all__ = ['cindex']

clang/bindings/python/clang/cindex.py

+9 −9
Original line number Diff line number Diff line
@@ -554,8 +554,8 @@ class BaseEnumeration(object): 
        if value >= len(self.__class__._kinds):

            self.__class__._kinds += [None] * (value - len(self.__class__._kinds) + 1)

        if self.__class__._kinds[value] is not None:

            raise ValueError,'{0} value {1} already loaded'.format(

                str(self.__class__), value)

            raise ValueError('{0} value {1} already loaded'.format(

                str(self.__class__), value))

        self.value = value

        self.__class__._kinds[value] = self

        self.__class__._name_map = None
@@ -577,7 +577,7 @@ class BaseEnumeration(object): 
    @classmethod

    def from_id(cls, id):

        if id >= len(cls._kinds) or cls._kinds[id] is None:

            raise ValueError,'Unknown template argument kind %d' % id

            raise ValueError('Unknown template argument kind %d' % id)

        return cls._kinds[id]



    def __repr__(self):
@@ -1777,7 +1777,7 @@ class StorageClass(object): 
        if value >= len(StorageClass._kinds):

            StorageClass._kinds += [None] * (value - len(StorageClass._kinds) + 1)

        if StorageClass._kinds[value] is not None:

            raise ValueError,'StorageClass already loaded'

            raise ValueError('StorageClass already loaded')

        self.value = value

        StorageClass._kinds[value] = self

        StorageClass._name_map = None
@@ -1798,7 +1798,7 @@ class StorageClass(object): 
    @staticmethod

    def from_id(id):

        if id >= len(StorageClass._kinds) or not StorageClass._kinds[id]:

            raise ValueError,'Unknown storage class %d' % id

            raise ValueError('Unknown storage class %d' % id)

        return StorageClass._kinds[id]



    def __repr__(self):
@@ -2729,9 +2729,9 @@ class TranslationUnit(ClangObject): 
                    # FIXME: It would be great to support an efficient version

                    # of this, one day.

                    value = value.read()

                    print value

                    print(value)

                if not isinstance(value, str):

                    raise TypeError,'Unexpected unsaved file contents.'

                    raise TypeError('Unexpected unsaved file contents.')

                unsaved_files_array[i].name = name

                unsaved_files_array[i].contents = value

                unsaved_files_array[i].length = len(value)
@@ -2793,9 +2793,9 @@ class TranslationUnit(ClangObject): 
                    # FIXME: It would be great to support an efficient version

                    # of this, one day.

                    value = value.read()

                    print value

                    print(value)

                if not isinstance(value, str):

                    raise TypeError,'Unexpected unsaved file contents.'

                    raise TypeError('Unexpected unsaved file contents.')

                unsaved_files_array[i].name = name

                unsaved_files_array[i].contents = value

                unsaved_files_array[i].length = len(value)