Skip to content

Commit c62d7d6

Browse files
committed
Merge branch 'hotfix/v1.7.1'
2 parents bc08328 + b0594bc commit c62d7d6

File tree

88 files changed

+29962
-636
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+29962
-636
lines changed

.coveragerc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
[run]
22
source = pygccxml,docs/example,unittests
3+
# unittest/misc contains some tests that are just there for debugging
4+
# purposes and which do not need to be covered.
5+
omit = unittests/misc
36
parallel = True
47

58
[report]

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,8 @@ docs/_build
44
unittests/temp
55
unittests/data/pygccxml.cache
66
.idea
7+
dist
8+
build
9+
pygccxml.egg-info
10+
*.prof
11+
.coverage

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Branches
4444

4545
The stable version can be found on the master branch.
4646

47-
The develop branch containes the latest improvements but can be unstable. Pull Requests should be done on the develop branch.
47+
The develop branch contains the latest improvements but can be unstable. Pull Requests should be done on the develop branch.
4848

4949
Testing and code coverage
5050
-------------------------

docs/apidocs/utils.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ pygccxml.utils package
22
======================
33

44
Modules
5-
--------
5+
-------
66

77
.. automodule:: pygccxml.utils.utils
88
:members:

docs/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@
5353
# built documents.
5454
#
5555
# The short X.Y version.
56-
version = 'v1.7.0'
56+
version = 'v1.7.1'
5757
# The full version, including alpha/beta/rc tags.
58-
release = 'v1.7.0'
58+
release = 'v1.7.1'
5959

6060
# The language for content autogenerated by Sphinx. Refer to documentation
6161
# for a list of supported languages.

docs/design.rst

Lines changed: 26 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,31 @@
22
Design overview
33
===============
44

5-
------------------------
6-
The view from 10000 fits
7-
------------------------
8-
95
pygccxml has 4 packages:
106

11-
* :mod:`declarations <pygccxml.declarations>` package defines classes that describe
12-
C++ declarations and types
7+
* :mod:`declarations <pygccxml.declarations>`
8+
9+
This package defines classes that describe C++ declarations and types.
10+
11+
* :mod:`parser <pygccxml.parser>`
12+
13+
This package defines classes that parse `GCC-XML`_
14+
or `CastXML`_ generated files. It also defines a few classes that will help
15+
you unnecessary parsing of C++ source files.
1316

14-
* :mod:`parser <pygccxml.parser>` package defines classes that parse `GCC-XML`_
15-
generated files. Also it defines few classes that will help you to eliminate
16-
unnecessary parsing of C++ source files.
17+
* :mod:`binary_parsers <pygccxml.binary_parsers>`
1718

18-
* :mod:`binary_parsers <pygccxml.binary_parsers>` package extracts some
19-
information from binary files ( `.so`, `.dll`, `.map` ) and merges it with
20-
the declarations tree.
19+
This package extracts information from binary files (`.so`, `.dll`, `.map`)
20+
and merges it with the declarations tree.
2121

22-
* ``utils`` package defines few functions, I found useful in the whole project.
22+
* :mod:`utils <pygccxml.utils>`
2323

24-
-------------------------
24+
This package defines a few functions useful for the whole project,
25+
but which are mainly used internally by pygccxml.
26+
27+
------------------------
2528
``declarations`` package
26-
-------------------------
29+
------------------------
2730

2831
Please take a look on the `UML diagram`_. This `UML diagram`_ describes almost all
2932
classes defined in the package and their relationship. ``declarations`` package
@@ -275,6 +278,13 @@ This is not the only bug, which could be fixed, there are few of them. pygccxml
275278
introduces few classes, which knows how to deal with specific bug. More over, those
276279
bugs are fixed, only if I am 101% sure, that this is the right thing to do.
277280

281+
-----------------
282+
``utils`` package
283+
-----------------
284+
285+
Use internally by pygccxml.
286+
Some methods/classes may be still usefull: loggers, find_xml_generator
287+
278288
-------
279289
Summary
280290
-------
@@ -287,6 +297,7 @@ information please read API documentation.
287297
.. _`SourceForge`: http://sourceforge.net/index.php
288298
.. _`Python`: http://www.python.org
289299
.. _`GCC-XML`: http://www.gccxml.org
300+
.. _`CastXML`: https://github.com/CastXML/CastXML
290301
.. _`UML diagram` : declarations_uml.png
291302
.. _`parser package UML diagram` : parser_uml.png
292303
.. _`ReleaseForge` : http://releaseforge.sourceforge.net

docs/history.rst

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,24 @@ to python 3 (keeping it compatible with python 2).
1111
In Mai 2014, Michka Popoff and the Insight Software Consortium revived pygccxml
1212
by setting up a git repositery on github, hosted along with gccxml.
1313

14+
Version 1.7.1
15+
-------------
16+
17+
1. Remove the __va_list_tag declaration from the tree when parsing with CastXML
18+
19+
The __va_list_tag declarations are internal declarations, which are often
20+
not needed. They are for example polluting the declarations tree when running
21+
pyplusplus.
22+
23+
This is optional but on by default. To still load the __va_list_tag declarations
24+
in the tree, a config flag can be set like this: ``config.flags = ["f1"]``,
25+
or by passing the ``flags=["f1"]`` argument the config setup.
26+
27+
2. Some code cleanup
28+
29+
3. Build new package for pypi. The ``1.7.0`` upload has gone wrong ...
30+
31+
1432
Version 1.7.0
1533
-------------
1634

@@ -124,6 +142,8 @@ Version 1.7.0
124142

125143
24. [Doc] Small documentation update, moved people list to credits page, added new examples.
126144

145+
25. [Misc] Add Travis unit tests for Python 3.5
146+
127147

128148
Version 1.6.2
129149
-------------

pygccxml/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,4 @@
4040
# TODO:
4141
# 1. Add "explicit" property for constructors
4242

43-
__version__ = 'v1.7.0'
43+
__version__ = 'v1.7.1'

pygccxml/binary_parsers/parsers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@ def merge_information(global_ns, fname, runs_under_unittest=False):
430430
"""high level function - select the appropriate binary file parser and
431431
integrates the information from the file to the declarations tree. """
432432
ext = os.path.splitext(fname)[1]
433-
parser = None
433+
434434
if '.dll' == ext:
435435
parser = dll_file_parser_t(global_ns, fname)
436436
elif '.map' == ext:

pygccxml/binary_parsers/undname.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
from .. import declarations
2222

2323

24-
class UNDECORATE_NAME_OPTIONS:
24+
class UNDECORATE_NAME_OPTIONS(object):
2525

2626
"""defines few constants for `UnDecorateSymbolName` function"""
2727

@@ -76,7 +76,7 @@ class UNDECORATE_NAME_OPTIONS:
7676
| UNDNAME_NO_ACCESS_SPECIFIERS | UNDNAME_NO_ECSU
7777

7878

79-
class undname_creator_t:
79+
class undname_creator_t(object):
8080

8181
"""implementation details - should not be used directly
8282
@@ -253,7 +253,7 @@ def format_decl(self, decl, hint=None):
253253
could be mapped later to the blobs.
254254
The valid options are: "msvc" and "nm".
255255
"""
256-
name = None
256+
257257
if hint is None:
258258
if 'nt' == os.name:
259259
hint = 'msvc'

0 commit comments

Comments
 (0)