Merge branch 'develop' into qt5

Conflicts:
	hscommon/desktop.py

hscommon/desktop.py

@@ -6,6 +6,9 @@
 # which should be included with this package. The terms are also available at 
 # http://www.hardcoded.net/licenses/bsd_license
 
+import os.path as op
+import logging
+
 class SpecialFolder:
     AppData = 1
     Cache = 2
@@ -25,30 +28,41 @@ def reveal_path(path):
     """
     _reveal_path(str(path))
 
-def special_folder_path(special_folder):
+def special_folder_path(special_folder, appname=None):
     """Returns the path of ``special_folder``.
     
-    ``special_folder`` is a SpecialFolder.* const.
+    ``special_folder`` is a SpecialFolder.* const. The result is the special folder for the current
+    application. The running process' application info is used to determine relevant information.
+    
+    You can override the application name with ``appname``. This argument is ingored under Qt.
     """
-    return _special_folder_path(special_folder)
+    return _special_folder_path(special_folder, appname)
 
 try:
-    from cocoa import proxy
+    # Normally, we would simply do "from cocoa import proxy", but due to a bug in pytest (currently
+    # at v2.4.2), our test suite is broken when we do that. This below is a workaround until that
+    # bug is fixed.
+    import cocoa
+    if not hasattr(cocoa, 'proxy'):
+        raise ImportError()
+    proxy = cocoa.proxy
     _open_url = proxy.openURL_
     _open_path = proxy.openPath_
     _reveal_path = proxy.revealPath_
     
-    def _special_folder_path(special_folder):
+    def _special_folder_path(special_folder, appname=None):
         if special_folder == SpecialFolder.Cache:
-            return proxy.getCachePath()
+            base = proxy.getCachePath()
         else:
-            return proxy.getAppdataPath()
+            base = proxy.getAppdataPath()
+        if not appname:
+            appname = proxy.bundleInfo_('CFBundleName')
+        return op.join(base, appname)
     
 except ImportError:
     try:
         from PyQt5.QtCore import QUrl, QStandardPaths
         from PyQt5.QtGui import QDesktopServices
-        import os.path as op
         def _open_path(path):
             url = QUrl.fromLocalFile(str(path))
             QDesktopServices.openUrl(url)
@@ -56,7 +70,7 @@ except ImportError:
         def _reveal_path(path):
             _open_path(op.dirname(str(path)))
         
-        def _special_folder_path(special_folder):
+        def _special_folder_path(special_folder, appname=None):
             if special_folder == SpecialFolder.Cache:
                 qtfolder = QStandardPaths.CacheLocation
             else:
@@ -64,4 +78,14 @@ except ImportError:
             return QStandardPaths.standardLocations(qtfolder)[0]
         
     except ImportError:
-        raise Exception("Can't setup desktop functions!")
+        # We're either running tests, and these functions don't matter much or we're in a really
+        # weird situation. Let's just have dummy fallbacks.
+        logging.warning("Can't setup desktop functions!")
+        def _open_path(path):
+            pass
+        
+        def _reveal_path(path):
+            pass
+        
+        def _special_folder_path(special_folder, appname=None):
+            return '/tmp'