Skip to content

Commit f687b15

Browse files
committed
Format using black and remove redundant imports
1 parent 06cf20e commit f687b15

File tree

3 files changed

+16
-18
lines changed

3 files changed

+16
-18
lines changed

src/bookmarks.py

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,8 @@
1515
# You should have received a copy of the GNU General Public License
1616
# along with this program. If not, see <http://www.gnu.org/licenses/>.
1717

18-
from gi.repository import Gio, GLib, GObject, Gtk
18+
from gi.repository import GLib, GObject, Gtk
1919

20-
from . import logger
21-
from . import utils
2220
import json, os
2321

2422

@@ -34,11 +32,13 @@ def __init__(self):
3432
GObject.GObject.__init__(self)
3533

3634
self.bookmarked = {}
37-
self._portfolio_config_path = os.path.join(GLib.get_user_config_dir(), "portfolio")
35+
self._portfolio_config_path = os.path.join(
36+
GLib.get_user_config_dir(), "portfolio"
37+
)
3838
self._bookmark_path = os.path.join(self._portfolio_config_path, "bookmarks")
3939

4040
try:
41-
with open(self._bookmark_path, 'r') as f:
41+
with open(self._bookmark_path, "r") as f:
4242
data = f.read()
4343
if not data is None:
4444
bookmarked = json.loads(data)
@@ -55,8 +55,7 @@ def __init__(self):
5555

5656
def _add_bookmark(self, path):
5757
if path not in self.bookmarked:
58-
name = os.path.basename(path)
59-
self.bookmarked[path] = 0 # Python Hashsets are limited?
58+
self.bookmarked[path] = 0 # Python Hashsets are limited?
6059
self.emit("add-bookmark", path)
6160

6261
def _delete_bookmark(self, path):
@@ -68,8 +67,8 @@ def is_bookmarked(self, path):
6867
return path in self.bookmarked
6968

7069
def _save_bookmarks(self):
71-
os.makedirs(self._portfolio_config_path, exist_ok = True)
72-
with open(self._bookmark_path, 'w') as f:
70+
os.makedirs(self._portfolio_config_path, exist_ok=True)
71+
with open(self._bookmark_path, "w") as f:
7372
paths = [bookmark for bookmark in self.bookmarked]
7473
json.dump(paths, f)
7574

@@ -80,10 +79,10 @@ def toggle_bookmark(self, button, path):
8079
self._add_bookmark(path)
8180
self._save_bookmarks()
8281

82+
8383
class PortfolioBookmarkButton(Gtk.Button):
8484
__gtype_name__ = "PortfolioBookmarkButton"
8585

86-
8786
def __init__(self, bookmarks):
8887
Gtk.Button.__init__(self)
8988
self.connect("clicked", self._on_bookmark_toggle)

src/places.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,9 @@ def _setup(self, bookmarks):
177177

178178
self._places_listbox = utils.find_child_by_id(self._places_group, "listbox")
179179
self._devices_listbox = utils.find_child_by_id(self._devices_group, "listbox")
180-
self._bookmarks_listbox = utils.find_child_by_id(self._bookmarks_group, "listbox")
180+
self._bookmarks_listbox = utils.find_child_by_id(
181+
self._bookmarks_group, "listbox"
182+
)
181183

182184
self._add_accessible_bookmarks()
183185
# no places message
@@ -420,17 +422,15 @@ def _on_bookmark_added(self, bookmark, path):
420422
def _add_accessible_bookmarks(self):
421423
for path in self._bookmarks.bookmarked:
422424
notAdded = self._find_place_by_path(self._bookmarks_listbox, path) is None
423-
if notAdded and os.path.isdir(path): # Might be a bookmarked path on a unmounted device
425+
if notAdded and os.path.isdir(
426+
path
427+
): # Might be a bookmarked path on a unmounted device
424428
self._add_bookmark_place(path)
425429

426430
def _add_bookmark_place(self, path):
427431
name = os.path.basename(path)
428432
place = self._add_place(
429-
self._bookmarks_group,
430-
"bookmark-filled-symbolic",
431-
name,
432-
path
433+
self._bookmarks_group, "bookmark-filled-symbolic", name, path
433434
)
434435
place.remove_bookmark.props.visible = True
435436
place.remove_bookmark.connect("clicked", self._on_bookmark_removed, path)
436-

src/window.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,6 @@ def _populate(self, directory):
233233
self._worker.start()
234234
self._bookmark_button.path = directory
235235

236-
237236
def _paste(self, Worker, to_paste):
238237
directory = self._history[self._index]
239238

0 commit comments

Comments
 (0)