FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Add MapScript support for Python 3.x by claudep · Pull Request #5561 · MapServer/MapServer · GitHub

/ MapServer Public

Add MapScript support for Python 3.x #5561

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.

Sign up for GitHub

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

Merged
Schpidi merged 1 commit into from
Mar 23, 2018
Conversation 4 Commits 1 Checks 0 Files changed
Merged

Add MapScript support for Python 3.x #5561

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension .i  (2) .py  (1) .txt  (1) All 3 file types selected
Only manifest files
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
6 changes: 3 additions & 3 deletions mapscript/python/CMakeLists.txt
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ FIND_PACKAGE(PythonInterp)
# interpreter that was found beforehand, and defaults to the system
# python. We first try to find python.h and libpython.so ourselves
# from the hints given by distutils and sys
execute_process ( COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_inc; print get_python_inc(True)" OUTPUT_VARIABLE PYTHON_INC OUTPUT_STRIP_TRAILING_WHITESPACE)
execute_process ( COMMAND ${PYTHON_EXECUTABLE} -c "import sys; print sys.prefix" OUTPUT_VARIABLE PYTHON_PREFIX OUTPUT_STRIP_TRAILING_WHITESPACE)
execute_process ( COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_inc; print(get_python_inc(True))" OUTPUT_VARIABLE PYTHON_INC OUTPUT_STRIP_TRAILING_WHITESPACE)
execute_process ( COMMAND ${PYTHON_EXECUTABLE} -c "import sys; print(sys.prefix)" OUTPUT_VARIABLE PYTHON_PREFIX OUTPUT_STRIP_TRAILING_WHITESPACE)

find_path(PYTHON_INCLUDE_PATH Python.h
HINTS ${PYTHON_INC}
Expand Down Expand Up @@ -37,7 +37,7 @@ set_target_properties(${SWIG_MODULE_pythonmapscript_REAL_NAME} PROPERTIES PREFIX
set_target_properties(${SWIG_MODULE_pythonmapscript_REAL_NAME} PROPERTIES OUTPUT_NAME _mapscript)


execute_process ( COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(True)" OUTPUT_VARIABLE PYTHON_SITE_PACKAGES OUTPUT_STRIP_TRAILING_WHITESPACE)
execute_process ( COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(True))" OUTPUT_VARIABLE PYTHON_SITE_PACKAGES OUTPUT_STRIP_TRAILING_WHITESPACE)

get_target_property(LOC_MAPSCRIPT_LIB ${SWIG_MODULE_pythonmapscript_REAL_NAME} LOCATION)
set(mapscript_files ${LOC_MAPSCRIPT_LIB} ${CMAKE_CURRENT_BINARY_DIR}/mapscript.py)
Expand Down
14 changes: 3 additions & 11 deletions mapscript/python/pyextend.i
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ def fromstring(data, mappath=None):
ob.updateFromString(data)
return ob
else:
raise ValueError, "No map, layer, class, or style found. Can not load from provided string"
raise ValueError("No map, layer, class, or style found. Can not load from provided string")
}

/* ===========================================================================
Expand Down Expand Up @@ -88,8 +88,7 @@ def fromstring(data, mappath=None):
else:
return False
else:
raise TypeError, \
'__contains__ does not yet handle %s' % (item_type)
raise TypeError('__contains__ does not yet handle %s' % (item_type))

}

Expand Down Expand Up @@ -350,13 +349,6 @@ def fromstring(data, mappath=None):

if (file == Py_None) /* write to stdout */
retval = msSaveImage(NULL, self, NULL);

else if (PyFile_Check(file)) /* a Python (C) file */
{
renderer = self->format->vtable;
/* FIXME? as an improvement, pass a map argument instead of the NULL (see #4216) */
retval = renderer->saveImage(self, NULL, PyFile_AsFile(file), self->format);
}
else /* presume a Python file-like object */
{
imgbuffer = msSaveImageBuffer(self, &imgsize,
Expand Down Expand Up @@ -392,7 +384,7 @@ def fromstring(data, mappath=None):
msSetError(MS_IMGERR, "failed to get image buffer", "saveToString()");
return NULL;
}
imgstring = PyString_FromStringAndSize((const char*) imgbytes, size);
imgstring = PyBytes_FromStringAndSize((const char*) imgbytes, size);
free(imgbytes);
return imgstring;
}
Expand Down
11 changes: 1 addition & 10 deletions mapscript/python/pymodule.i
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,9 @@
/* Translates Python None to C NULL for strings */
%typemap(in,parse="z") char * "";

/* Translate Python's built-in file object to FILE * */
%typemap(in) FILE * {
if (!PyFile_Check($input)) {
PyErr_SetString(PyExc_TypeError, "Input is not file");
return NULL;
}
$1 = PyFile_AsFile($input);
}

/* To support imageObj::getBytes */
%typemap(out) gdBuffer {
$result = PyString_FromStringAndSize((const char*)$1.data, $1.size);
$result = PyBytes_FromStringAndSize((const char*)$1.data, $1.size);
if( $1.owns_data )
msFree($1.data);
}
Expand Down
11 changes: 6 additions & 5 deletions mapscript/python/setup.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ def unique(list):
ret_list = []
dict = {}
for item in list:
if not dict.has_key(item):
if not item in dict:
dict[item] = ''
ret_list.append( item )
return ret_list
Expand Down Expand Up @@ -80,8 +80,8 @@ def read_mapscriptvars():

try:
fp = open(mapscriptvars, "r")
except IOError, e:
raise IOError, '%s. %s' % (e, "Has MapServer been made?")
except IOError as e:
raise IOError('%s. Has MapServer been made?' % e)

output = {}
install_dir = fp.readline().strip()
Expand Down Expand Up @@ -136,7 +136,7 @@ class ms_ext(build_ext):
])

def initialize_options(self):
print "LD_RUN_PATH set"
print("LD_RUN_PATH set")
os.environ["LD_RUN_PATH"] = os.getcwd()+"/../../.libs"
build_ext.initialize_options(self)
self.gdaldir = None
Expand Down Expand Up @@ -238,7 +238,8 @@ def finalize_options(self):
ext_modules = [mapserver_module,]
py_modules = ['mapscript',]

readme = file('README','rb').read()
with open('README', 'r') as fh:
readme = fh.read()

if not os.path.exists('mapscript_wrap.c') :
swig_cmd = """swig -python -shadow -modern -templatereduce -fastdispatch -fvirtual -fastproxy -modernargs -castmode -dirvtable -fastinit -fastquery -noproxydel -nobuildnone %s -o mapscript_wrap.c ../mapscript.i"""
Expand Down
Back | FazBrowse Home | New Git URL