diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-12-21 15:42:34 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-12-21 15:43:12 +0100 |
| commit | b1b1ffcdff68f8e2c46608a3f3b10607c97d5dd1 (patch) | |
| tree | f619fe4c7c9bde56ce167c08cfa1555fef2e5dd6 /sources/pyside2/doc | |
| parent | dbfdd3499f234bf39c358b71f2f001fad51961e8 (diff) | |
| parent | cd1037060e0cbc263e601fb67fbd40d85c8801a1 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.9
Change-Id: I78039827d32c1d4d540a8b1b2afd4841e40d5c2c
Diffstat (limited to 'sources/pyside2/doc')
| -rw-r--r-- | sources/pyside2/doc/inheritance_diagram.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sources/pyside2/doc/inheritance_diagram.py b/sources/pyside2/doc/inheritance_diagram.py index 616b47057..a7f376ccd 100644 --- a/sources/pyside2/doc/inheritance_diagram.py +++ b/sources/pyside2/doc/inheritance_diagram.py @@ -295,7 +295,7 @@ class InheritanceDiagram(Directive): graph = InheritanceGraph( class_names, env.temp_data.get('py:module'), parts=node['parts']) - except InheritanceException, err: + except InheritanceException as err: return [node.document.reporter.warning(err.args[0], line=self.lineno)] |