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.

Comments (0)

Files changed (1)

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:
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.