Changeset 3424

Timestamp:

Jun 6, 2018 2:38:31 PM (5 years ago)

Author:

toby

Message:

On Windows, check documents before my documents

File:

• trunk/GSASIIctrlGUI.py (modified) (1 diff)

trunk/GSASIIctrlGUI.py

@@ -5173 +5173 @@
         if GSASIIpath.GetConfigValue('Tutorial_location'):
             self.tutorialPath = os.path.abspath(GSASIIpath.GetConfigValue('Tutorial_location'))
-        elif (sys.platform.lower().startswith('win') and
-              os.path.exists(os.path.abspath(os.path.expanduser('~/My Documents')))):
-            self.tutorialPath = os.path.abspath(os.path.expanduser('~/My Documents/G2tutorials'))
-        elif (sys.platform.lower().startswith('win') and
-              os.path.exists(os.path.abspath(os.path.expanduser('~/Documents')))):
-            self.tutorialPath = os.path.abspath(os.path.expanduser('~/Documents/G2tutorials'))
-        else:
-            self.tutorialPath = os.path.abspath(os.path.expanduser('~/G2tutorials'))
+        elif (sys.platform.lower().startswith('win')):
+            for p in ('Documents','My Documents'):
+                if os.path.exists(os.path.abspath(os.path.expanduser(
+                      os.path.join('~',p)))):
+                    self.tutorialPath = os.path.abspath(os.path.expanduser(
+                      os.path.join('~',p,'G2tutorials')))
+                    return
+        else:
+            self.tutorialPath = os.path.abspath(os.path.expanduser(
+                    os.path.join('~','G2tutorials')))
 
     def SelectAndDownload(self,event):