From 0224e8e22ac7cf2e82254aeb23f1208214b2aaa5 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@richvdh.org>
Date: Mon, 12 Aug 2013 22:06:23 +0100
Subject: [PATCH] Fix a TypeError in DoxyEmitter

There is a problem with 7674543f, in that if HTML_FILE_EXTENSION or
MAN_EXTENSION is not specified, we'll try to concatenate a string with
None, and get a type error. We should check that they are set before
trying to use them.
---
 doxygen.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doxygen.py b/doxygen.py
index 13a0f5bf5..f397be065 100644
--- a/doxygen.py
+++ b/doxygen.py
@@ -262,7 +262,7 @@ def DoxyEmitter(target, source, env):
          if k == 'MAN':
             # Is the given extension valid?
             manext = v[3]
-            if v[4]:
+            if v[4] and data.has_key(v[4]):
                manext = data.get(v[4])
             # Try to strip off dots
             manext = manext.replace('.','')
@@ -284,7 +284,7 @@ def DoxyEmitter(target, source, env):
          # Add target files
          if k != "MAN":
             # Is an extension override var given?
-            if v[4]:
+            if v[4] and data.has_key(v[4]):
                fname = v[2]+data.get(v[4])
             else:
                fname = v[2]+v[3]