[python-shapely] 04/148: Imported Upstream version 1.0.15
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Thu Aug 20 17:41:57 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository python-shapely.
commit e2c019839e9a8efe62f99c64f6bee9cba42fc7ad
Author: Pietro Battiston <toobaz at email.it>
Date: Fri Apr 30 12:21:53 2010 +0200
Imported Upstream version 1.0.15
---
._CHANGES.txt | Bin 0 -> 186 bytes
._CREDITS.txt | Bin 0 -> 185 bytes
._HISTORY.txt | Bin 0 -> 184 bytes
._LICENSE.txt | Bin 0 -> 184 bytes
._MANIFEST.in | Bin 0 -> 186 bytes
._README.txt | Bin 0 -> 187 bytes
PKG-INFO | 2 +-
Shapely.egg-info/PKG-INFO | 2 +-
Shapely.egg-info/SOURCES.txt | 7 --
Shapely.egg-info/requires.txt | 3 +-
examples/._geoms.py | Bin 0 -> 184 bytes
examples/._world.py | Bin 0 -> 184 bytes
manual/style.css | 231 -------------------------------------
setup.py | 2 +-
setup_windows.py | 37 ------
shapely/.___init__.py | Bin 0 -> 185 bytes
shapely/._ctypes_declarations.py | Bin 0 -> 187 bytes
shapely/._iterops.py | Bin 0 -> 184 bytes
shapely/._ops.py | Bin 0 -> 184 bytes
shapely/._predicates.py | Bin 0 -> 186 bytes
shapely/._topology.py | Bin 0 -> 187 bytes
shapely/._wkb.py | Bin 0 -> 187 bytes
shapely/geometry/._base.py | Bin 0 -> 184 bytes
shapely/geometry/._linestring.py | Bin 0 -> 184 bytes
shapely/geos.py | 69 +++++++----
tests/._Array.txt | Bin 0 -> 184 bytes
tests/._GeoInterface.txt | Bin 0 -> 184 bytes
tests/._Persist.txt | Bin 0 -> 184 bytes
tests/._Point.txt | Bin 0 -> 184 bytes
tests/._Predicates.txt | Bin 0 -> 184 bytes
tests/._binascii_hex.txt | Bin 0 -> 184 bytes
tests/__init__.py | 2 -
tests/rungrind.dist | 4 -
tests/test_doctests.py | 35 ------
tests/test_threads.py | 33 ------
tests/valgrind-python.supp | 240 ---------------------------------------
tests/wkt_locale.txt | 2 +-
37 files changed, 52 insertions(+), 617 deletions(-)
diff --git a/._CHANGES.txt b/._CHANGES.txt
new file mode 100644
index 0000000..e4be6ea
Binary files /dev/null and b/._CHANGES.txt differ
diff --git a/._CREDITS.txt b/._CREDITS.txt
new file mode 100644
index 0000000..2da06ff
Binary files /dev/null and b/._CREDITS.txt differ
diff --git a/._HISTORY.txt b/._HISTORY.txt
new file mode 100644
index 0000000..963bf98
Binary files /dev/null and b/._HISTORY.txt differ
diff --git a/._LICENSE.txt b/._LICENSE.txt
new file mode 100644
index 0000000..1dd305d
Binary files /dev/null and b/._LICENSE.txt differ
diff --git a/._MANIFEST.in b/._MANIFEST.in
new file mode 100644
index 0000000..74268d9
Binary files /dev/null and b/._MANIFEST.in differ
diff --git a/._README.txt b/._README.txt
new file mode 100644
index 0000000..5881da3
Binary files /dev/null and b/._README.txt differ
diff --git a/PKG-INFO b/PKG-INFO
index ac76cbe..6764f2a 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: Shapely
-Version: 1.0.14
+Version: 1.0.15
Summary: Geospatial geometries, predicates, and operations
Home-page: http://trac.gispython.org/lab/wiki/Shapely
Author: Sean Gillies
diff --git a/Shapely.egg-info/PKG-INFO b/Shapely.egg-info/PKG-INFO
index ac76cbe..6764f2a 100644
--- a/Shapely.egg-info/PKG-INFO
+++ b/Shapely.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: Shapely
-Version: 1.0.14
+Version: 1.0.15
Summary: Geospatial geometries, predicates, and operations
Home-page: http://trac.gispython.org/lab/wiki/Shapely
Author: Sean Gillies
diff --git a/Shapely.egg-info/SOURCES.txt b/Shapely.egg-info/SOURCES.txt
index 3784d1b..f13dc9e 100644
--- a/Shapely.egg-info/SOURCES.txt
+++ b/Shapely.egg-info/SOURCES.txt
@@ -6,7 +6,6 @@ LICENSE.txt
MANIFEST.in
README.txt
setup.py
-setup_windows.py
Shapely.egg-info/PKG-INFO
Shapely.egg-info/SOURCES.txt
Shapely.egg-info/dependency_links.txt
@@ -15,7 +14,6 @@ Shapely.egg-info/top_level.txt
examples/geoms.py
examples/world.py
manual/manual.txt
-manual/style.css
shapely/__init__.py
shapely/ctypes_declarations.py
shapely/geos.py
@@ -48,14 +46,9 @@ tests/Persist.txt
tests/Point.txt
tests/Polygon.txt
tests/Predicates.txt
-tests/__init__.py
tests/attribute-chains.txt
tests/binascii_hex.txt
tests/dimensions.txt
tests/invalid_intersection.txt
tests/polygonize.txt
-tests/rungrind.dist
-tests/test_doctests.py
-tests/test_threads.py
-tests/valgrind-python.supp
tests/wkt_locale.txt
\ No newline at end of file
diff --git a/Shapely.egg-info/requires.txt b/Shapely.egg-info/requires.txt
index e0bd690..8b6d003 100644
--- a/Shapely.egg-info/requires.txt
+++ b/Shapely.egg-info/requires.txt
@@ -1,2 +1 @@
-setuptools
-ctypes
\ No newline at end of file
+setuptools
\ No newline at end of file
diff --git a/examples/._geoms.py b/examples/._geoms.py
new file mode 100644
index 0000000..b703ef1
Binary files /dev/null and b/examples/._geoms.py differ
diff --git a/examples/._world.py b/examples/._world.py
new file mode 100644
index 0000000..b255630
Binary files /dev/null and b/examples/._world.py differ
diff --git a/manual/style.css b/manual/style.css
deleted file mode 100644
index 941516a..0000000
--- a/manual/style.css
+++ /dev/null
@@ -1,231 +0,0 @@
-/* css */
-
-body {
- font: 90% 'Lucida Grande', Verdana, Geneva, Lucida, Arial, Helvetica, sans-serif;
- background: #ffffff;
- color: black;
- margin: 2em;
- padding: 2em;
-}
-
-a[href] {
- color: #436976;
- background-color: transparent;
-}
-
-a.toc-backref {
- text-decoration: none;
-}
-
-h1 a[href] {
- text-decoration: none;
- color: #fcb100;
- background-color: transparent;
-}
-
-a.strong {
- font-weight: bold;
-}
-
-img {
- margin: 0;
- border: 0;
-}
-
-p {
- margin: 0.5em 0 1em 0;
- line-height: 1.5em;
-}
-p a {
- text-decoration: underline;
-}
-p a:visited {
- color: purple;
- background-color: transparent;
-}
-p a:active {
- color: red;
- background-color: transparent;
-}
-a:hover {
- text-decoration: none;
-}
-p img {
- border: 0;
- margin: 0;
-}
-
-h1, h2, h3, h4, h5, h6 {
- color: #003a6b;
- background-color: transparent;
- font: 100% 'Lucida Grande', Verdana, Geneva, Lucida, Arial, Helvetica, sans-serif;
- margin: 0;
- padding-top: 0.5em;
-}
-
-h1 {
- font-size: 160%;
- margin-bottom: 0.5em;
- border-bottom: 1px solid #fcb100;
-}
-h2 {
- font-size: 140%;
- margin-bottom: 0.5em;
- border-bottom: 1px solid #aaa;
-}
-h3 {
- font-size: 130%;
- margin-bottom: 0.5em;
- text-decoration: underline;
-}
-h4 {
- font-size: 110%;
- font-weight: bold;
-}
-h5 {
- font-size: 100%;
- font-weight: bold;
-}
-h6 {
- font-size: 80%;
- font-weight: bold;
-}
-
-ul a, ol a {
- text-decoration: underline;
-}
-
-dt {
- font-weight: bold;
-}
-dt a {
- text-decoration: none;
-}
-
-dd {
- line-height: 1.5em;
- margin-bottom: 1em;
-}
-
-legend {
- background: #ffffff;
- padding: 0.5em;
-}
-
-form {
- margin: 0;
-}
-
-
-dl.form {
- margin: 0;
- padding: 1em;
-}
-
-dl.form dt {
- width: 30%;
- float: left;
- margin: 0;
- padding: 0 0.5em 0.5em 0;
- text-align: right;
-}
-
-input {
- font: 100% 'Lucida Grande', Verdana, Geneva, Lucida, Arial, Helvetica, sans-serif;
- color: black;
- background-color: white;
- vertical-align: middle;
-}
-
-abbr, acronym, .explain {
- color: black;
- background-color: transparent;
-}
-
-q, blockquote {
-}
-
-code, pre {
- font-family: monospace;
- font-size: 1.2em;
- display: block;
- padding: 10px;
- border: 1px solid #838183;
- background-color: #eee;
- color: #000;
- overflow: auto;
- margin: 0.5em 1em;
-}
-
-tt.docutils {
- background-color: #eeeeee;
-}
-
-.docinfo {
- text-align: left;
-}
-
-div.highlight {
- margin-left: 2em ;
- margin-right: 2em ;
- background-color: #eeeeee
- }
-
-.c { color: #008800; font-style: italic } /* Comment */
-.err { border: 1px solid #FF0000 } /* Error */
-.k { color: #AA22FF; font-weight: bold } /* Keyword */
-.o { color: #666666 } /* Operator */
-.cm { color: #008800; font-style: italic } /* Comment.Multiline */
-.cp { color: #008800 } /* Comment.Preproc */
-.c1 { color: #008800; font-style: italic } /* Comment.Single */
-.gd { color: #A00000 } /* Generic.Deleted */
-.ge { font-style: italic } /* Generic.Emph */
-.gr { color: #FF0000 } /* Generic.Error */
-.gh { color: #000080; font-weight: bold } /* Generic.Heading */
-.gi { color: #00A000 } /* Generic.Inserted */
-.go { color: #808080 } /* Generic.Output */
-.gp { color: #000080; font-weight: bold } /* Generic.Prompt */
-.gs { font-weight: bold } /* Generic.Strong */
-.gu { color: #800080; font-weight: bold } /* Generic.Subheading */
-.gt { color: #0040D0 } /* Generic.Traceback */
-.kc { color: #AA22FF; font-weight: bold } /* Keyword.Constant */
-.kd { color: #AA22FF; font-weight: bold } /* Keyword.Declaration */
-.kp { color: #AA22FF } /* Keyword.Pseudo */
-.kr { color: #AA22FF; font-weight: bold } /* Keyword.Reserved */
-.kt { color: #AA22FF; font-weight: bold } /* Keyword.Type */
-.m { color: #666666 } /* Literal.Number */
-.s { color: #BB4444 } /* Literal.String */
-.na { color: #BB4444 } /* Name.Attribute */
-.nb { color: #AA22FF } /* Name.Builtin */
-.nc { color: #0000FF } /* Name.Class */
-.no { color: #880000 } /* Name.Constant */
-.nd { color: #AA22FF } /* Name.Decorator */
-.ni { color: #999999; font-weight: bold } /* Name.Entity */
-.ne { color: #D2413A; font-weight: bold } /* Name.Exception */
-.nf { color: #00A000 } /* Name.Function */
-.nl { color: #A0A000 } /* Name.Label */
-.nn { color: #0000FF; font-weight: bold } /* Name.Namespace */
-.nt { color: #008000; font-weight: bold } /* Name.Tag */
-.nv { color: #B8860B } /* Name.Variable */
-.ow { color: #AA22FF; font-weight: bold } /* Operator.Word */
-.mf { color: #666666 } /* Literal.Number.Float */
-.mh { color: #666666 } /* Literal.Number.Hex */
-.mi { color: #666666 } /* Literal.Number.Integer */
-.mo { color: #666666 } /* Literal.Number.Oct */
-.sb { color: #BB4444 } /* Literal.String.Backtick */
-.sc { color: #BB4444 } /* Literal.String.Char */
-.sd { color: #BB4444; font-style: italic } /* Literal.String.Doc */
-.s2 { color: #BB4444 } /* Literal.String.Double */
-.se { color: #BB6622; font-weight: bold } /* Literal.String.Escape */
-.sh { color: #BB4444 } /* Literal.String.Heredoc */
-.si { color: #BB6688; font-weight: bold } /* Literal.String.Interpol */
-.sx { color: #008000 } /* Literal.String.Other */
-.sr { color: #BB6688 } /* Literal.String.Regex */
-.s1 { color: #BB4444 } /* Literal.String.Single */
-.ss { color: #B8860B } /* Literal.String.Symbol */
-.bp { color: #AA22FF } /* Name.Builtin.Pseudo */
-.vc { color: #B8860B } /* Name.Variable.Class */
-.vg { color: #B8860B } /* Name.Variable.Global */
-.vi { color: #B8860B } /* Name.Variable.Instance */
-.il { color: #666666 } /* Literal.Number.Integer.Long */
-
diff --git a/setup.py b/setup.py
index 5596735..14e3b5e 100644
--- a/setup.py
+++ b/setup.py
@@ -10,7 +10,7 @@ if version_info[:2] < (2,5):
readme_text = file('README.txt', 'rb').read()
setup(name = 'Shapely',
- version = '1.0.14',
+ version = '1.0.15',
description = 'Geospatial geometries, predicates, and operations',
license = 'BSD',
keywords = 'geometry topology',
diff --git a/setup_windows.py b/setup_windows.py
deleted file mode 100644
index 08d8cc0..0000000
--- a/setup_windows.py
+++ /dev/null
@@ -1,37 +0,0 @@
-from setuptools import setup, Extension
-from sys import version_info
-
-# Require ctypes egg only for Python < 2.5
-install_requires = ['setuptools']
-if version_info[:2] < (2,5):
- install_requires.append('ctypes')
-
-# Get text from README.txt
-readme_text = file('README.txt', 'rb').read()
-
-setup(name = 'Shapely',
- version = '1.0.14',
- description = 'Geospatial geometries, predicates, and operations',
- license = 'BSD',
- keywords = 'geometry topology',
- author = 'Sean Gillies',
- author_email = 'sgillies at frii.com',
- maintainer = 'Sean Gillies',
- maintainer_email = 'sgillies at frii.com',
- url = 'http://trac.gispython.org/lab/wiki/Shapely',
- long_description = readme_text,
- packages = ['shapely', 'shapely.geometry'],
- data_files=[('DLLs', ['DLLs/geos.dll', 'DLLs/libgeos-3-0-0.dll']),],
- install_requires = install_requires,
- #tests_require = ['numpy'], -- not working with "tests" command
- test_suite = 'tests.test_suite',
- classifiers = [
- 'Development Status :: 5 - Production/Stable',
- 'Intended Audience :: Developers',
- 'Intended Audience :: Science/Research',
- 'License :: OSI Approved :: BSD License',
- 'Operating System :: OS Independent',
- 'Programming Language :: Python',
- 'Topic :: Scientific/Engineering :: GIS',
- ],
-)
diff --git a/shapely/.___init__.py b/shapely/.___init__.py
new file mode 100644
index 0000000..a69f6cc
Binary files /dev/null and b/shapely/.___init__.py differ
diff --git a/shapely/._ctypes_declarations.py b/shapely/._ctypes_declarations.py
new file mode 100644
index 0000000..8078108
Binary files /dev/null and b/shapely/._ctypes_declarations.py differ
diff --git a/shapely/._iterops.py b/shapely/._iterops.py
new file mode 100644
index 0000000..69476e9
Binary files /dev/null and b/shapely/._iterops.py differ
diff --git a/shapely/._ops.py b/shapely/._ops.py
new file mode 100644
index 0000000..6011f43
Binary files /dev/null and b/shapely/._ops.py differ
diff --git a/shapely/._predicates.py b/shapely/._predicates.py
new file mode 100644
index 0000000..b3329f2
Binary files /dev/null and b/shapely/._predicates.py differ
diff --git a/shapely/._topology.py b/shapely/._topology.py
new file mode 100644
index 0000000..b7dcb87
Binary files /dev/null and b/shapely/._topology.py differ
diff --git a/shapely/._wkb.py b/shapely/._wkb.py
new file mode 100644
index 0000000..18c1290
Binary files /dev/null and b/shapely/._wkb.py differ
diff --git a/shapely/geometry/._base.py b/shapely/geometry/._base.py
new file mode 100644
index 0000000..8fe3660
Binary files /dev/null and b/shapely/geometry/._base.py differ
diff --git a/shapely/geometry/._linestring.py b/shapely/geometry/._linestring.py
new file mode 100644
index 0000000..01bc948
Binary files /dev/null and b/shapely/geometry/._linestring.py differ
diff --git a/shapely/geos.py b/shapely/geos.py
index 75fd667..e3d518b 100644
--- a/shapely/geos.py
+++ b/shapely/geos.py
@@ -11,20 +11,15 @@ import sys
from ctypes_declarations import prototype
-if sys.platform == 'win32':
- try:
- local_dlls = os.path.abspath(os.__file__ + "../../../DLLs")
- original_path = os.environ['PATH']
- os.environ['PATH'] = "%s;%s" % (local_dlls, original_path)
- lgeos = PyDLL("geos.dll")
- except (ImportError, WindowsError):
- raise
- def free(m):
- try:
- cdll.msvcrt.free(m)
- except WindowsError:
- # XXX: See http://trac.gispython.org/projects/PCL/ticket/149
- pass
+# Find and load the GEOS and C libraries
+# If this ever gets any longer, we'll break it into separate modules
+
+if sys.platform == 'linux2':
+ lgeos = PyDLL(find_library('geos_c'))
+ free = CDLL(find_library('c')).free
+ free.argtypes = [c_void_p]
+ free.restype = None
+
elif sys.platform == 'darwin':
lib = find_library('geos_c')
if lib is None:
@@ -40,13 +35,43 @@ elif sys.platform == 'darwin':
lib = path
break
if lib is None:
- raise ImportError, "Could not find geos_c library"
+ raise ImportError("Could not find geos_c library")
lgeos = PyDLL(lib)
- free = CDLL(find_library('libc')).free
- free.argtypes=[c_void_p]
- free.restype=None
-else:
- # Try the major versioned name first, falling back on the unversioned name.
+ free = CDLL(find_library('c')).free
+ free.argtypes = [c_void_p]
+ free.restype = None
+
+elif sys.platform == 'win32':
+ try:
+ local_dlls = os.path.abspath(os.__file__ + "../../../DLLs")
+ original_path = os.environ['PATH']
+ os.environ['PATH'] = "%s;%s" % (local_dlls, original_path)
+ lgeos = PyDLL("geos.dll")
+ except (ImportError, WindowsError):
+ raise
+ def free(m):
+ try:
+ cdll.msvcrt.free(m)
+ except WindowsError:
+ # XXX: See http://trac.gispython.org/projects/PCL/ticket/149
+ pass
+
+elif sys.platform == 'sunos5':
+ # Try the major versioned name first, falling back on the unversioned
+ # name.
+ try:
+ lgeos = PyDLL('libgeos_c.so.1')
+ except (OSError, ImportError):
+ lgeos = PyDLL('libgeos_c.so')
+ except:
+ raise
+ free = CDLL('libc.so.1').free
+ free.argtypes = [c_void_p]
+ free.restype = None
+
+else: # other *nix systems
+ # Try the major versioned name first, falling back on the unversioned
+ # name.
try:
lgeos = PyDLL('libgeos_c.so.1')
except (OSError, ImportError):
@@ -54,8 +79,8 @@ else:
except:
raise
free = CDLL('libc.so.6').free
- free.argtypes=[c_void_p]
- free.restype=None
+ free.argtypes = [c_void_p]
+ free.restype = None
# Prototype the libgeos_c functions using new code from `tarley` in
# http://trac.gispython.org/lab/ticket/189
diff --git a/tests/._Array.txt b/tests/._Array.txt
new file mode 100644
index 0000000..3c85056
Binary files /dev/null and b/tests/._Array.txt differ
diff --git a/tests/._GeoInterface.txt b/tests/._GeoInterface.txt
new file mode 100644
index 0000000..96f164d
Binary files /dev/null and b/tests/._GeoInterface.txt differ
diff --git a/tests/._Persist.txt b/tests/._Persist.txt
new file mode 100644
index 0000000..3ba76d6
Binary files /dev/null and b/tests/._Persist.txt differ
diff --git a/tests/._Point.txt b/tests/._Point.txt
new file mode 100644
index 0000000..2939fa5
Binary files /dev/null and b/tests/._Point.txt differ
diff --git a/tests/._Predicates.txt b/tests/._Predicates.txt
new file mode 100644
index 0000000..6a0a63d
Binary files /dev/null and b/tests/._Predicates.txt differ
diff --git a/tests/._binascii_hex.txt b/tests/._binascii_hex.txt
new file mode 100644
index 0000000..787b15c
Binary files /dev/null and b/tests/._binascii_hex.txt differ
diff --git a/tests/__init__.py b/tests/__init__.py
deleted file mode 100644
index 4e9a837..0000000
--- a/tests/__init__.py
+++ /dev/null
@@ -1,2 +0,0 @@
-# package
-from test_doctests import test_suite
diff --git a/tests/rungrind.dist b/tests/rungrind.dist
deleted file mode 100644
index 80f8005..0000000
--- a/tests/rungrind.dist
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-#export PYTHONPATH=YOUR_CUSTOM_PATH
-valgrind --tool=memcheck --leak-check=yes --suppressions=valgrind-python.supp python test_doctests.py
-
diff --git a/tests/test_doctests.py b/tests/test_doctests.py
deleted file mode 100644
index 25d5f7a..0000000
--- a/tests/test_doctests.py
+++ /dev/null
@@ -1,35 +0,0 @@
-import doctest
-import unittest
-import glob
-import os
-
-optionflags = (doctest.REPORT_ONLY_FIRST_FAILURE |
- doctest.NORMALIZE_WHITESPACE |
- doctest.ELLIPSIS)
-
-def list_doctests():
- print __file__
- return [filename
- for filename
- in glob.glob(os.path.join(os.path.dirname(__file__), '*.txt'))]
-
-def open_file(filename, mode='r'):
- """Helper function to open files from within the tests package."""
- return open(os.path.join(os.path.dirname(__file__), filename), mode)
-
-def setUp(test):
- test.globs.update(dict(
- open_file = open_file,
- ))
-
-def test_suite():
- return unittest.TestSuite(
- [doctest.DocFileSuite(os.path.basename(filename),
- optionflags=optionflags,
- setUp=setUp)
- for filename
- in list_doctests()])
-
-if __name__ == "__main__":
- runner = unittest.TextTestRunner(verbosity=1)
- runner.run(test_suite())
diff --git a/tests/test_threads.py b/tests/test_threads.py
deleted file mode 100644
index ac1a212..0000000
--- a/tests/test_threads.py
+++ /dev/null
@@ -1,33 +0,0 @@
-import threading
-
-def main():
- num_threads = 4
- use_threads = True
-
- if not use_threads:
- # Run core code
- runShapelyBuilding()
- else:
- threads = [threading.Thread(target=runShapelyBuilding) for x in range(num_threads)]
- for t in threads:
- t.start()
- for t in threads:
- t.join()
-
-def runShapelyBuilding():
- import shapely.wkt
- import shapely.wkb
-
- print "Running shapely tests on wkb"
-
- wkb = shapely.wkt.loads("POINT (0 0)").wkb
-
- for i in xrange(1000):
- obj = shapely.wkb.loads(wkb)
-
- print "Done"
-
-# Run main
-if __name__ == '__main__':
- main()
-
diff --git a/tests/valgrind-python.supp b/tests/valgrind-python.supp
deleted file mode 100644
index 440fb4a..0000000
--- a/tests/valgrind-python.supp
+++ /dev/null
@@ -1,240 +0,0 @@
-#
-# This is a valgrind suppression file that should be used when using valgrind.
-#
-# Here's an example of running valgrind:
-#
-# cd python/dist/src
-# valgrind --tool=memcheck --suppressions=Misc/valgrind-python.supp \
-# ./python -E -tt ./Lib/test/regrtest.py -u bsddb,network
-#
-# You must edit Objects/obmalloc.c and uncomment Py_USING_MEMORY_DEBUGGER
-# to use the preferred suppressions with Py_ADDRESS_IN_RANGE.
-#
-# If you do not want to recompile Python, you can uncomment
-# suppressions for PyObject_Free and PyObject_Realloc.
-#
-# See Misc/README.valgrind for more information.
-
-# all tool names: Addrcheck,Memcheck,cachegrind,helgrind,massif
-{
- ADDRESS_IN_RANGE/Invalid read of size 4
- Memcheck:Addr4
- fun:Py_ADDRESS_IN_RANGE
-}
-
-{
- ADDRESS_IN_RANGE/Invalid read of size 4
- Memcheck:Value4
- fun:Py_ADDRESS_IN_RANGE
-}
-
-{
- ADDRESS_IN_RANGE/Conditional jump or move depends on uninitialised value
- Memcheck:Cond
- fun:Py_ADDRESS_IN_RANGE
-}
-
-{
- ADDRESS_IN_RANGE/Invalid read of size 4
- Memcheck:Addr4
- fun:PyObject_Free
-}
-
-{
- ADDRESS_IN_RANGE/Invalid read of size 4
- Memcheck:Value4
- fun:PyObject_Free
-}
-
-{
- ADDRESS_IN_RANGE/Conditional jump or move depends on uninitialised value
- Memcheck:Cond
- fun:PyObject_Free
-}
-
-{
- ADDRESS_IN_RANGE/Invalid read of size 4
- Memcheck:Addr4
- fun:PyObject_Realloc
-}
-
-{
- ADDRESS_IN_RANGE/Invalid read of size 4
- Memcheck:Value4
- fun:PyObject_Realloc
-}
-
-{
- ADDRESS_IN_RANGE/Conditional jump or move depends on uninitialised value
- Memcheck:Cond
- fun:PyObject_Realloc
-}
-
-###
-### All the suppressions below are for errors that occur within libraries
-### that Python uses. The problems to not appear to be related to Python's
-### use of the libraries.
-###
-{
- GDBM problems, see test_gdbm
- Memcheck:Param
- write(buf)
- fun:write
- fun:gdbm_open
-
-}
-
-###
-### These occur from somewhere within the SSL, when running
-### test_socket_sll. They are too general to leave on by default.
-###
-###{
-### somewhere in SSL stuff
-### Memcheck:Cond
-### fun:memset
-###}
-###{
-### somewhere in SSL stuff
-### Memcheck:Value4
-### fun:memset
-###}
-###
-###{
-### somewhere in SSL stuff
-### Memcheck:Cond
-### fun:MD5_Update
-###}
-###
-###{
-### somewhere in SSL stuff
-### Memcheck:Value4
-### fun:MD5_Update
-###}
-
-#
-# All of these problems come from using test_socket_ssl
-#
-{
- from test_socket_ssl
- Memcheck:Cond
- fun:BN_bin2bn
-}
-
-{
- from test_socket_ssl
- Memcheck:Cond
- fun:BN_num_bits_word
-}
-
-{
- from test_socket_ssl
- Memcheck:Value4
- fun:BN_num_bits_word
-}
-
-{
- from test_socket_ssl
- Memcheck:Cond
- fun:BN_mod_exp_mont_word
-}
-
-{
- from test_socket_ssl
- Memcheck:Cond
- fun:BN_mod_exp_mont
-}
-
-{
- from test_socket_ssl
- Memcheck:Param
- write(buf)
- fun:write
- obj:/usr/lib/libcrypto.so.0.9.7
-}
-
-{
- from test_socket_ssl
- Memcheck:Cond
- fun:RSA_verify
-}
-
-{
- from test_socket_ssl
- Memcheck:Value4
- fun:RSA_verify
-}
-
-{
- from test_socket_ssl
- Memcheck:Value4
- fun:DES_set_key_unchecked
-}
-
-{
- from test_socket_ssl
- Memcheck:Value4
- fun:DES_encrypt2
-}
-
-{
- from test_socket_ssl
- Memcheck:Cond
- obj:/usr/lib/libssl.so.0.9.7
-}
-
-{
- from test_socket_ssl
- Memcheck:Value4
- obj:/usr/lib/libssl.so.0.9.7
-}
-
-{
- from test_socket_ssl
- Memcheck:Cond
- fun:BUF_MEM_grow_clean
-}
-
-{
- from test_socket_ssl
- Memcheck:Cond
- fun:memcpy
- fun:ssl3_read_bytes
-}
-
-{
- from test_socket_ssl
- Memcheck:Cond
- fun:SHA1_Update
-}
-
-{
- from test_socket_ssl
- Memcheck:Value4
- fun:SHA1_Update
-}
-
-
-# some extra lxml specific (?) suppressions..
-
-{
- Test
- Memcheck:Param
- sigaction(act)
- fun:__libc_sigaction
-}
-
-{
- ld
- Memcheck:Cond
- obj:/lib/ld-2.6.so
- obj:/lib/ld-2.6.so
- obj:*
-}
-
-{
- ld
- Memcheck:Addr4
- obj:/lib/ld-2.6.so
- obj:/lib/ld-2.6.so
- obj:*
-}
diff --git a/tests/wkt_locale.txt b/tests/wkt_locale.txt
index bf6b431..ebbc024 100644
--- a/tests/wkt_locale.txt
+++ b/tests/wkt_locale.txt
@@ -5,7 +5,7 @@ Set locale to one that uses a comma as decimal seperator`
>>> import locale, sys
>>> if sys.platform == 'win32':
- ... _ = locale.setlocale(locale.LC_ALL, 'portuguese-brazil')
+ ... _ = locale.setlocale(locale.LC_ALL, 'portuguese_brazil')
... else:
... _ = locale.setlocale(locale.LC_ALL, 'pt_BR.UTF-8')
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-shapely.git
More information about the Pkg-grass-devel
mailing list