Skip to content

Commit 25ea095

Browse files
committed
* linting cleanup
1 parent 81919c7 commit 25ea095

File tree

1 file changed

+20
-23
lines changed

1 file changed

+20
-23
lines changed

index.py

+20-23
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ def do_tags():
7979
tag_id = ''
8080
tag_get = ''
8181
show_mine = ''
82-
auth = auth_check()
8382
if request.query.get('id'):
8483
tag_id = request.query.get('id')
8584
tag_get = '&id={}'.format(tag_id)
@@ -121,7 +120,7 @@ def do_tags():
121120
if request.query.get('page'):
122121
page = int(request.query.get('page'))
123122
prev = int(page) - 1
124-
next = int(page) + 1 # pylint: W0622
123+
next = int(page) + 1 # pylint: W622
125124
max_results = user_num_bmarks
126125
# Calculate the offset
127126
from_offset = (int(page) * int(max_results)) - int(max_results)
@@ -160,8 +159,7 @@ def do_tags():
160159
<LI class="item"><A HREF="{u}&num=15">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{a15}15&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a></LI>
161160
<LI class="item"><A HREF="{u}&num=20">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{a20}20&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a></LI>
162161
<LI class="item"><A HREF="{u}&num=30">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{a30}30&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a></LI></UL>
163-
</DIV>&nbsp;</TD>'''.format(n=num_bmarks_menu_offset,
164-
u=url_get_base,
162+
</DIV>&nbsp;</TD>'''.format(u=url_get_base,
165163
a5=marker_dict['5'],
166164
a10=marker_dict['10'],
167165
a15=marker_dict['15'],
@@ -179,10 +177,10 @@ def do_tags():
179177
if notes:
180178
notes_string = f'<BR><span class="small"><B>{notes}</B></span>'
181179
if hash_check() and owner == username:
182-
bmark_user_edit_string = f'''<BR><A HREF="edit?id={i}&func=edit"><span class="normal"><B>EDIT</B></a>
180+
bmark_user_edit_string = f'''<BR><A HREF="edit?id={bm_id}&func=edit"><span class="normal"><B>EDIT</B></a>
183181
&nbsp;|&nbsp;<A HREF="bmarks?id={bm_id}&func=del"><B>DELETE</B></a>&nbsp;</span>'''
184182
else:
185-
bmark_user_edit_string = f'''<BR><span class="normal">Created by <A HREF="bmarks?whose={o}">
183+
bmark_user_edit_string = f'''<BR><span class="normal">Created by <A HREF="bmarks?whose={owner}">
186184
<B>{owner}</B></a>&nbsp;</span>'''
187185
return_data += '''<TABLE><TR>
188186
<TD valign="top" width="95"><span class="big">{l}&nbsp;&nbsp;&nbsp;</span></TD>
@@ -204,7 +202,7 @@ def do_tags():
204202
t=tag_get)
205203
# Create a NEXT link if one is needed
206204
if page < total_pages:
207-
pagination += f'''<A STYLE="text-decoration:none" title="NEXT PAGE"
205+
pagination += f'''<A STYLE="text-decoration:none" title="NEXT PAGE"
208206
HREF="tags?{mine}&page={next}&num={user_num_bmarks}{tag_get}">
209207
<span class="huge"><H1>&rarr;</H1></span></A>'''
210208
else:
@@ -272,23 +270,22 @@ def list_tags():
272270
if not tags_qry_res:
273271
return_data += '<span class="bad">You have 0 tags<BR>'
274272
return return_data
273+
if auth['username']:
274+
tag_string = '<span class="big"><B>Your Tags</B></span><BR><BR>'
275+
show_mine = '&mine=yes'
275276
else:
276-
if auth['username']:
277-
tag_string = '<span class="big"><B>Your Tags</B></span><BR><BR>'
278-
show_mine = '&mine=yes'
279-
else:
280-
tag_string = '<span class="big"><B>Recent Tags</B></span><BR><BR>'
281-
show_mine = ''
282-
num_tags = len(tags_qry_res)
283-
if num_tags:
284-
return_data += tag_string
285-
for tag_list in tags_qry_res:
286-
tag_id = tag_list[0]
287-
tag = tag_list[1]
288-
return_data += '&nbsp;&nbsp;<A HREF="tags?id={i}{sh}">{t}</a>&nbsp;<BR>'.format(i=tag_id,
289-
sh=show_mine,
290-
t=tag)
291-
return_data += '<BR>'
277+
tag_string = '<span class="big"><B>Recent Tags</B></span><BR><BR>'
278+
show_mine = ''
279+
num_tags = len(tags_qry_res)
280+
if num_tags:
281+
return_data += tag_string
282+
for tag_list in tags_qry_res:
283+
tag_id = tag_list[0]
284+
tag = tag_list[1]
285+
return_data += '&nbsp;&nbsp;<A HREF="tags?id={i}{sh}">{t}</a>&nbsp;<BR>'.format(i=tag_id,
286+
sh=show_mine,
287+
t=tag)
288+
return_data += '<BR>'
292289
return return_data
293290

294291

0 commit comments

Comments
 (0)