Commits

Yuya Nishihara  committed 3dc907b

settings: handle ImportError of pywintypes correctly

We cannot catch both ImportError and pywintypes.com_error at the same
level, because ImportError means pywintypes is not assigned.

  • Participants
  • Parent commits b198faa
  • Branches stable

Comments (0)

Files changed (1)

File tortoisehg/util/settings.py

         if os.name == 'nt':
             try:
                 import pywintypes
-                from win32com.shell import shell, shellcon
-                appdir = shell.SHGetSpecialFolderPath(0, shellcon.CSIDL_APPDATA)
-            except (ImportError, pywintypes.com_error):
+                try:
+                    from win32com.shell import shell, shellcon
+                    appdir = shell.SHGetSpecialFolderPath(0, shellcon.CSIDL_APPDATA)
+                except pywintypes.com_error:
+                    appdir = os.environ['APPDATA']
+            except ImportError:
                 appdir = os.environ['APPDATA']
             return os.path.join(appdir, 'TortoiseHg', appname)
         else: