Skip to content

converted obamenu from python 2 to 3 using 2to3 tool to fix Invalid output from pipe-menu "obamenu" #74

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Giuncan wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

converted obamenu from python 2 to 3 using 2to3 tool to fix Invalid output from pipe-menu "obamenu" #74

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions rcm/server/bin/obamenu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ def xescape(s):

def process_category(cat, curCats, appGroups = application_groups, aliases = group_aliases ):
# first process aliases
if aliases.has_key(cat):
if cat in aliases:
if aliases[cat] == "":
return "" # ignore this one
cat = aliases[cat]
Expand Down Expand Up @@ -137,7 +137,7 @@ def process_dtfile(dtf, catDict): # process this file & extract relevant info
# else
eqi = l.split('=')
if len(eqi) < 2:
print "Error: Invalid .desktop line'" + l + "'"
print("Error: Invalid .desktop line'" + l + "'")
continue
# Check what it is ...
if eqi[0] == "Name":
Expand Down Expand Up @@ -194,9 +194,9 @@ if __name__ == "__main__":

# now, generate jwm menu include
if simpleOBheader == True:
print '<openbox_pipe_menu>' # magic header
print('<openbox_pipe_menu>') # magic header
else:
print '<?xml version="1.0" encoding="UTF-8" ?><openbox_pipe_menu xmlns="http://openbox.org/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://openbox.org/" >' # magic header
print('<?xml version="1.0" encoding="UTF-8" ?><openbox_pipe_menu xmlns="http://openbox.org/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://openbox.org/" >') # magic header
appGroupLen = len(application_groups)
for ag in range(appGroupLen ):
catList = categoryDict[application_groups[ag]]
Expand All @@ -206,7 +206,7 @@ if __name__ == "__main__":
tmp = getCatIcon(application_groups[ag])
if tmp != "":
catStr += "icon=\"%s\"" % tmp
print catStr, ">"
print(catStr, ">")
for app in catList:
progStr = "<item "
progStr += "label=\"%s\" " % app.Name
Expand All @@ -216,7 +216,7 @@ if __name__ == "__main__":
if app.Terminal == True:
progStr += terminal_string + " "
progStr += "%s]]></command></action></item>" % app.Exec
print progStr
print "</menu>"
print "</openbox_pipe_menu>" # magic footer
print(progStr)
print("</menu>")
print("</openbox_pipe_menu>") # magic footer
pass # done/debug break
Loading