| Message ID | 2ea88b534bc8b763b5d56e181c94ee7662d35414.1521222704.git.crobinso@redhat.com |
|---|---|
| State | Accepted |
| Commit | 960ff97be304adcc7a497b09a08390f1daeea3c6 |
| Headers | show |
| Series | apibuild: fix with python3 | expand |
On Fri, Mar 16, 2018 at 02:05:11PM -0400, Cole Robinson wrote: > Module 'string' function lower doesn't exist in python3. The canonical > way is to call .lower() on a str instance. Do that, and make the > exception handling more specific, which would have made this issue > obvious. > > Signed-off-by: Cole Robinson <crobinso@redhat.com> > --- > docs/apibuild.py | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> > > diff --git a/docs/apibuild.py b/docs/apibuild.py > index 67b7eed1e..e81980e3c 100755 > --- a/docs/apibuild.py > +++ b/docs/apibuild.py > @@ -2326,10 +2326,10 @@ class docBuilder: > for data in ('Summary', 'Description', 'Author'): > try: > output.write(" <%s>%s</%s>\n" % ( > - string.lower(data), > + data.lower(), > escape(dict.info[data]), > - string.lower(data))) > - except: > + data.lower())) > + except KeyError: > self.warning("Header %s lacks a %s description" % (module, data)) > if 'Description' in dict.info: > desc = dict.info['Description'] > -- > 2.14.3 > > -- > libvir-list mailing list > libvir-list@redhat.com > https://www.redhat.com/mailman/listinfo/libvir-list Regards, Daniel
diff --git a/docs/apibuild.py b/docs/apibuild.py index 67b7eed1e..e81980e3c 100755 --- a/docs/apibuild.py +++ b/docs/apibuild.py @@ -2326,10 +2326,10 @@ class docBuilder: for data in ('Summary', 'Description', 'Author'): try: output.write(" <%s>%s</%s>\n" % ( - string.lower(data), + data.lower(), escape(dict.info[data]), - string.lower(data))) - except: + data.lower())) + except KeyError: self.warning("Header %s lacks a %s description" % (module, data)) if 'Description' in dict.info: desc = dict.info['Description']
Module 'string' function lower doesn't exist in python3. The canonical way is to call .lower() on a str instance. Do that, and make the exception handling more specific, which would have made this issue obvious. Signed-off-by: Cole Robinson <crobinso@redhat.com> --- docs/apibuild.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list