Merge pull request #1631 from cclauss/identity-is-not-equality-in-python

Use ==/!= to compare str literals

DemoPrograms/Demo_Button_States.py

@@ -46,6 +46,6 @@ while True:
         [window.FindElement(key).Update(disabled=value) for key,value in {'_Start_':False, '_Stop_':True, '_Reset_':True, '_Submit_':True}.items()]
         recording = False
         have_data = False
-    elif event is '_Submit_' and have_data:
+    elif event == '_Submit_' and have_data:
         [window.FindElement(key).Update(disabled=value) for key,value in {'_Start_':False, '_Stop_':True, '_Reset_':True, '_Submit_':False}.items()]
         recording = False

DemoPrograms/Demo_Canvas.py

@@ -18,7 +18,5 @@ while True:
     event, values = window.Read()
     if event is None:
         break
-    if event is 'Blue':
+    if event in ('Blue', 'Red'):
-        window.FindElement('canvas').TKCanvas.itemconfig(cir, fill = "Blue")
+        window.FindElement('canvas').TKCanvas.itemconfig(cir, fill=event)
-    elif event is 'Red':
-        window.FindElement('canvas').TKCanvas.itemconfig(cir, fill = "Red")

DemoPrograms/Demo_Chat.py

@@ -31,7 +31,7 @@ window = sg.Window('Chat window',
 # ---===--- Loop taking in user input and using it  --- #
 while True:
     event, value = window.Read()
-    if event is 'SEND':
+    if event == 'SEND':
         query = value['query'].rstrip()
         # EXECUTE YOUR COMMAND HERE
         print('The command you entered was {}'.format(query))

DemoPrograms/Demo_Chat_With_History.py

@@ -33,7 +33,7 @@ def ChatBotWithHistory():
     history_offset = 0
     while True:
         (event, value) = window.Read()
-        if event is 'SEND':
+        if event == 'SEND':
             query = value['query'].rstrip()
             # EXECUTE YOUR COMMAND HERE
             print('The command you entered was {}'.format(query))
@@ -41,7 +41,7 @@ def ChatBotWithHistory():
             history_offset = len(command_history)-1
             window.FindElement('query').Update('')                       # manually clear input because keyboard events blocks clear
             window.FindElement('history').Update('\n'.join(command_history[-3:]))
-        elif event is None or event is 'EXIT':            # quit if exit event or X
+        elif event in (None, 'EXIT'):            # quit if exit event or X
             break
         elif 'Up' in event and len(command_history):
             command = command_history[history_offset]

DemoPrograms/Demo_Chatterbot.py

@@ -67,7 +67,7 @@ window = sg.Window('Chat Window', auto_size_text=True, default_element_size=(30,
 # ---===--- Loop taking in user input and using it to query HowDoI web oracle --- #
 while True:
     event, (value,) = window.Read()
-    if event is not 'SEND':
+    if event != 'SEND':
         break
     string = value.rstrip()
     print('     '+string)

DemoPrograms/Demo_Chatterbot_With_TTS.py

@@ -87,7 +87,7 @@ window = sg.Window('Chat Window', auto_size_text=True, default_element_size=(30,
 # ---===--- Loop taking in user input and using it to query HowDoI web oracle --- #
 while True:
     event, (value,) = window.Read()
-    if event is not 'SEND':
+    if event != 'SEND':
         break
     string = value.rstrip()
     print('     '+string)

DemoPrograms/Demo_Desktop_Widget_Timer.py

@@ -46,9 +46,9 @@ while (True):
     if event == 'button':
         event = window.FindElement(event).GetText()
     # --------- Do Button Operations --------
-    if event is None or event == 'Exit':        # ALWAYS give a way out of program
+    if event in (None, 'Exit'):        # ALWAYS give a way out of program
         break
-    if event is 'Reset':
+    if event == 'Reset':
         start_time = int(round(time.time() * 100))
         current_time = 0
         paused_time = start_time

DemoPrograms/Demo_EXE_Maker.py

@@ -25,7 +25,7 @@ def Launcher():
     # ---===--- Loop taking in user input --- #
     while True:
         (button, values) = window.Read()
-        if button is 'Quit' or button is None:
+        if button in ('Quit', None):
             break           # exit button clicked
 
         source_file = values['_sourcefile_']
@@ -40,7 +40,7 @@ def Launcher():
         file_to_remove = os.path.join(source_path, source_filename[:-3]+'.spec')
         command_line = 'pyinstaller -wF "{}" {} {} {} {}'.format(source_file, icon_option, workpath_option, dispath_option, specpath_option)
 
-        if button is 'Make EXE':
+        if button == 'Make EXE':
             try:
                 print(command_line)
                 print('Making EXE... this will take a while.. the program has NOT locked up...')

DemoPrograms/Demo_Fill_Form.py

@@ -48,15 +48,15 @@ def Everything():
     while True:
         event, values = window.Read()
 
-        if event is 'SaveSettings':
+        if event == 'SaveSettings':
             filename = sg.PopupGetFile('Save Settings', save_as=True, no_window=True)
             window.SaveToDisk(filename)
             # save(values)
-        elif event is 'LoadSettings':
+        elif event == 'LoadSettings':
             filename = sg.PopupGetFile('Load Settings', no_window=True)
             window.LoadFromDisk(filename)
             # load(form)
-        elif event in ['Exit', None]:
+        elif event in ('Exit', None):
             break
 
     # window.CloseNonBlocking()

DemoPrograms/Demo_Graph_Drawing.py

@@ -21,11 +21,9 @@ while True:
     event, values = window.Read()
     if event is None:
         break
-    if event is 'Blue':
+    if event in ('Blue', 'Red'):
-        graph.TKCanvas.itemconfig(circle, fill = "Blue")
+        graph.TKCanvas.itemconfig(circle, fill=event)
-    elif event is 'Red':
+    elif event == 'Move':
-        graph.TKCanvas.itemconfig(circle, fill = "Red")
-    elif event is 'Move':
         graph.MoveFigure(point, 10,10)
         graph.MoveFigure(circle, 10,10)
         graph.MoveFigure(oval, 10,10)

DemoPrograms/Demo_Matplotlib_Animated.py

@@ -37,7 +37,7 @@ def main():
     dpts = [randint(0, 10) for x in range(10000)]
     for i in range(len(dpts)):
         event, values = window.Read(timeout=10)
-        if event is 'Exit' or event is None:
+        if event in ('Exit', None):
             exit(69)
 
         slider_elem.Update(i)

DemoPrograms/Demo_Matplotlib_Animated_Scatter.py

@@ -27,7 +27,7 @@ def main():
 
     while True:
         event, values = window.Read(timeout=10)
-        if event is 'Exit' or event is None:
+        if event in ('Exit', None):
             exit(69)
 
         def PyplotScatterWithLegend():

DemoPrograms/Demo_Matplotlib_Browser.py

@@ -889,7 +889,7 @@ while True:
     event, values = window.Read()
     print(event)
     # show it all again and get buttons
-    if event is None or event is 'Exit':
+    if event in (None, 'Exit'):
         break
 
     try:

DemoPrograms/Demo_Matplotlib_Browser_Paned.py

@@ -893,7 +893,7 @@ while True:
     event, values = window.Read()
     # print(event)
     # show it all again and get buttons
-    if event is None or event is 'Exit':
+    if event in (None, 'Exit'):
         break
 
     try:

DemoPrograms/Demo_Matplotlib_Ping_Graph.py

@@ -663,7 +663,7 @@ def main():
 
     while True:
         event, values = window.Read(timeout=0)
-        if event is 'Exit' or event is None:
+        if event in ('Exit', None):
             exit(0)
 
         run_a_ping_and_graph()

DemoPrograms/Demo_Matplotlib_Ping_Graph_Large.py

@@ -97,7 +97,7 @@ def main():
 
     while True:
         event, values = window.Read(timeout=0)
-        if event is 'Exit' or event is None:
+        if event in ('Exit', None):
             break
 
         run_a_ping_and_graph()
@@ -106,5 +106,3 @@ def main():
 
 if __name__ == '__main__':
     main()
-
-

DemoPrograms/Demo_NonBlocking_Form.py

@@ -28,7 +28,7 @@ def StatusOutputExample():
         # This is the code that reads and updates your window
         event, values = window.Read(timeout=10)
         window.FindElement('output').Update('{:02d}:{:02d}.{:02d}'.format((i // 100) // 60, (i // 100) % 60, i % 100))
-        if event == 'Quit' or event is None:
+        if event in ('Quit', None):
             break
         if event == 'LED On':
             print('Turning on the LED')
@@ -63,9 +63,9 @@ def RemoteControlExample():
     while (True):
         # This is the code that reads and updates your window
         event, values = window.Read(timeout=0, timeout_key='timeout')
-        if event is not 'timeout':
+        if event != 'timeout':
             print(event)
-        if event == 'Quit' or event is None:
+        if event in ('Quit', None):
             break
 
     window.Close()

DemoPrograms/Demo_OpenCV.py

@@ -41,7 +41,7 @@ def main():
     i = 0
     while vidFile.isOpened():
         event, values = window.Read(timeout=0)
-        if event is 'Exit' or event is None:
+        if event in ('Exit', None):
             exit(69)
         ret, frame = vidFile.read()
         if not ret:  # if out of data stop looping

DemoPrograms/Demo_Pi_LEDs.py

@@ -45,9 +45,9 @@ while True:
     if event is None:
         break
 
-    if event is 'Switch LED':
+    if event == 'Switch LED':
         window.FindElement('output').Update(SwitchLED())
-    elif event is 'Flash LED':
+    elif event == 'Flash LED':
         window.FindElement('output').Update('LED is Flashing')
         window.Refresh()
         FlashLED()

DemoPrograms/Demo_Script_Launcher.py

@@ -62,7 +62,7 @@ def Launcher2():
             print('Quickly launch your favorite programs using these shortcuts')
             print('Or  copy files to your github folder.  Or anything else you type on the command line')
             # copyfile(source, dest)
-        elif event is 'Run':
+        elif event == 'Run':
             for index, file in enumerate(values['demolist']):
                 print('Launching %s'%file)
                 window.Refresh()          # make the print appear immediately

DemoPrograms/Demo_Timer.py

@@ -27,9 +27,9 @@ def Timer():
         if values is None or button == 'Exit':
             break
 
-        if button is 'Reset':
+        if button == 'Reset':
             i=0
-        elif button is 'Pause':
+        elif button == 'Pause':
             paused = not paused
 
         if not paused:

DemoPrograms/Demo_Youtube-dl_Frontend.py

@@ -45,9 +45,7 @@ def DownloadSubtitlesGUI():
             print('Done')
 
         elif event == 'Download':
-            lang = values['lang']
+            lang = values['lang'] or 'en'
-            if lang is '':
-                lang = 'en'
             print(f'Downloading subtitle for {lang}...')
             window.Refresh()
             command = [f'C:\\Python\\Anaconda3\\Scripts\\youtube-dl.exe --sub-lang {lang} --write-sub {link}',]

HowDoI/PySimpleGUI-HowDoI.py

@@ -47,7 +47,7 @@ def HowDoI():
     history_offset = 0
     while True:
         (button, value) = window.Read()
-        if button is 'SEND':
+        if button == 'SEND':
             query = value['query'].rstrip()
             print(query)
             QueryHowDoI(query, value['Num Answers'], value['full text'])  # send the string to HowDoI
@@ -55,7 +55,7 @@ def HowDoI():
             history_offset = len(command_history)-1
             window.FindElement('query').Update('')                       # manually clear input because keyboard events blocks clear
             window.FindElement('history').Update('\n'.join(command_history[-3:]))
-        elif button is None or button is 'EXIT':            # if exit button or closed using X
+        elif button in (None, 'EXIT'):            # if exit button or closed using X
             break
         elif 'Up' in button and len(command_history):                                # scroll back in history
             command = command_history[history_offset]

PySimpleGUIQt/Demo Programs/Qt_Demo_Desktop_Widget_Timer.py

@@ -48,9 +48,9 @@ while (True):
     if event == 'button':
         event = window.FindElement(event).GetText()
     # --------- Do Button Operations --------
-    if event is None or event == 'Exit':  # ALWAYS give a way out of program
+    if event in (None, 'Exit'):  # ALWAYS give a way out of program
         break
-    if event is 'Reset':
+    if event == 'Reset':
         start_time = int(round(time.time() * 100))
         current_time = 0
         paused_time = start_time

PySimpleGUIWeb/Demo Programs/Web_Timer.py

@@ -30,9 +30,9 @@ while (True):
     if event == 'button':
         event = window.FindElement(event).GetText()
     # --------- Do Button Operations --------
-    if event is None or event == 'Exit':        # ALWAYS give a way out of program
+    if event in (None, 'Exit'):        # ALWAYS give a way out of program
         break
-    if event is 'Reset':
+    if event == 'Reset':
         start_time = int(round(time.time() * 100))
         current_time = 0
         paused_time = start_time

exemaker/pysimplegui-exemaker/pysimplegui-exemaker.py

@@ -25,7 +25,7 @@ def Launcher():
     # ---===--- Loop taking in user input --- #
     while True:
         (button, values) = window.Read()
-        if button is 'Quit' or button is None:
+        if button in ('Quit', None):
             break           # exit button clicked
 
         source_file = values['_sourcefile_']
@@ -40,7 +40,7 @@ def Launcher():
         file_to_remove = os.path.join(source_path, source_filename[:-3]+'.spec')
         command_line = 'pyinstaller -wF "{}" {} {} {} {}'.format(source_file, icon_option, workpath_option, dispath_option, specpath_option)
 
-        if button is 'Make EXE':
+        if button == 'Make EXE':
             out=''
             try:
                 print(command_line)