[libvirt] [PATCH] apibuild: Turn hidden_macros into array
This is an array, not a hash table. It makes no problem with newer pythons, but with python2.6 it is a problem: File "../../docs/apibuild.py", line 117 "VIR_DEPRECATED", # internal macro to mark deprecated apis ^ SyntaxError: invalid syntax Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- docs/apibuild.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/apibuild.py b/docs/apibuild.py index 9c82c4a..d065d56 100755 --- a/docs/apibuild.py +++ b/docs/apibuild.py @@ -113,10 +113,10 @@ ignored_macros = { } # macros that should be completely skipped -hidden_macros = { +hidden_macros = [ "VIR_DEPRECATED", # internal macro to mark deprecated apis "VIR_EXPORT_VAR", # internal macro to mark exported vars -} +] def escape(raw): raw = string.replace(raw, '&', '&') -- 2.7.3
On Fri, Apr 22, 2016 at 11:09:37 +0200, Michal Privoznik wrote:
This is an array, not a hash table. It makes no problem with newer pythons, but with python2.6 it is a problem:
File "../../docs/apibuild.py", line 117 "VIR_DEPRECATED", # internal macro to mark deprecated apis ^ SyntaxError: invalid syntax
Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- docs/apibuild.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/docs/apibuild.py b/docs/apibuild.py index 9c82c4a..d065d56 100755 --- a/docs/apibuild.py +++ b/docs/apibuild.py @@ -113,10 +113,10 @@ ignored_macros = { }
# macros that should be completely skipped -hidden_macros = { +hidden_macros = [ "VIR_DEPRECATED", # internal macro to mark deprecated apis "VIR_EXPORT_VAR", # internal macro to mark exported vars -} +]
That's another option, but I think the fix Peter pushed for this some time ago is good enough. Jirka
On 22.04.2016 11:26, Jiri Denemark wrote:
On Fri, Apr 22, 2016 at 11:09:37 +0200, Michal Privoznik wrote:
This is an array, not a hash table. It makes no problem with newer pythons, but with python2.6 it is a problem:
File "../../docs/apibuild.py", line 117 "VIR_DEPRECATED", # internal macro to mark deprecated apis ^ SyntaxError: invalid syntax
Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- docs/apibuild.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/docs/apibuild.py b/docs/apibuild.py index 9c82c4a..d065d56 100755 --- a/docs/apibuild.py +++ b/docs/apibuild.py @@ -113,10 +113,10 @@ ignored_macros = { }
# macros that should be completely skipped -hidden_macros = { +hidden_macros = [ "VIR_DEPRECATED", # internal macro to mark deprecated apis "VIR_EXPORT_VAR", # internal macro to mark exported vars -} +]
That's another option, but I think the fix Peter pushed for this some time ago is good enough.
I don't think he pushed any fix. What he did in his recent commit in this area was to introduce this array. I don't see any other movement in that respect. What commit exactly do you have in mind? Michal
On Fri, Apr 22, 2016 at 12:34:54 +0200, Michal Privoznik wrote:
On 22.04.2016 11:26, Jiri Denemark wrote:
On Fri, Apr 22, 2016 at 11:09:37 +0200, Michal Privoznik wrote:
This is an array, not a hash table. It makes no problem with newer pythons, but with python2.6 it is a problem:
File "../../docs/apibuild.py", line 117 "VIR_DEPRECATED", # internal macro to mark deprecated apis ^ SyntaxError: invalid syntax
Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- docs/apibuild.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/docs/apibuild.py b/docs/apibuild.py index 9c82c4a..d065d56 100755 --- a/docs/apibuild.py +++ b/docs/apibuild.py @@ -113,10 +113,10 @@ ignored_macros = { }
# macros that should be completely skipped -hidden_macros = { +hidden_macros = [ "VIR_DEPRECATED", # internal macro to mark deprecated apis "VIR_EXPORT_VAR", # internal macro to mark exported vars -} +]
That's another option, but I think the fix Peter pushed for this some time ago is good enough.
I don't think he pushed any fix. What he did in his recent commit in this area was to introduce this array. I don't see any other movement in that respect. What commit exactly do you have in mind?
Hmm, you're right. I saw "pushed as a build breaker" and thought he had pushed it already... That said, ACK, please push your version. Jirka
On Fri, Apr 22, 2016 at 12:41:53 +0200, Jiri Denemark wrote:
On Fri, Apr 22, 2016 at 12:34:54 +0200, Michal Privoznik wrote:
I don't think he pushed any fix. What he did in his recent commit in this area was to introduce this array. I don't see any other movement in that respect. What commit exactly do you have in mind?
Hmm, you're right. I saw "pushed as a build breaker" and thought he had pushed it already...
That said, ACK, please push your version.
Oh well, looking at libvirt-python repo doesn't really help when I want to find the patch from Peter :-) Anyway, one of the two patches is pushed, which is what we wanted to achieve... Jirka
participants (2)
-
Jiri Denemark -
Michal Privoznik