Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
updated boost, numpy, patch open folder bug
- Loading branch information
1 parent
3d35b74
commit 1bc73f5
Showing
2 changed files
with
77 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| 83a84,86 | ||
| > DBUS_FM_ID = 'org.freedesktop.FileManager1' | ||
| > DBUS_FM_PATH = '/org/freedesktop/FileManager1' | ||
| > | ||
| 357a361 | ||
| > | ||
| 360,371c364,377 | ||
| < filemanager1 = bus.get_object( | ||
| < 'org.freedesktop.FileManager1', '/org/freedesktop/FileManager1' | ||
| < ) | ||
| < paths = [urljoin('file:', pathname2url(path))] | ||
| < filemanager1.ShowItems( | ||
| < paths, startup_id, dbus_interface='org.freedesktop.FileManager1' | ||
| < ) | ||
| < else: | ||
| < env = os.environ.copy() | ||
| < env['DESKTOP_STARTUP_ID'] = startup_id.replace('dbus', 'xdg-open') | ||
| < # No option in xdg to highlight a file so just open parent folder. | ||
| < subprocess.Popen(['xdg-open', os.path.dirname(path.rstrip('/'))], env=env) | ||
| --- | ||
| > try: | ||
| > filemanager1 = bus.get_object(DBUS_FM_ID, DBUS_FM_PATH) | ||
| > except dbus.exceptions.DBusException as ex: | ||
| > log.debug('Unable to get dbus file manager: %s', ex) | ||
| > # Fallback to xdg-open | ||
| > else: | ||
| > paths = [urljoin('file:', pathname2url(path))] | ||
| > filemanager1.ShowItems(paths, startup_id, dbus_interface=DBUS_FM_ID) | ||
| > return | ||
| > | ||
| > env = os.environ.copy() | ||
| > env['DESKTOP_STARTUP_ID'] = startup_id.replace('dbus', 'xdg-open') | ||
| > # No option in xdg to highlight a file so just open parent folder. | ||
| > subprocess.Popen(['xdg-open', os.path.dirname(path.rstrip('/'))], env=env) | ||
| 376c382 | ||
| < Opens a url in the desktop's default browser | ||
| --- | ||
| > Opens a URL in the desktop's default browser | ||
| 378c384 | ||
| < :param url: the url to open | ||
| --- | ||
| > :param url: the URL to open | ||
| 698c704 | ||
| < :param url: the url to test | ||
| --- | ||
| > :param url: the URL to test | ||
| 734c740 | ||
| < A check to determine if a uri is a valid bittorrent magnet uri | ||
| --- | ||
| > A check to determine if a URI is a valid bittorrent magnet URI | ||
| 736c742 | ||
| < :param uri: the uri to check | ||
| --- | ||
| > :param uri: the URI to check | ||
| 822c828 | ||
| < """Creates a magnet uri | ||
| --- | ||
| > """Creates a magnet URI | ||
| 830c836 | ||
| < str: A magnet uri string. | ||
| --- | ||
| > str: A magnet URI string. | ||
| 1178c1184 | ||
| < """Grabs the localclient auth line from the 'auth' file and creates a localhost uri. | ||
| --- | ||
| > """Grabs the localclient auth line from the 'auth' file and creates a localhost URI. |