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

Use ==/!= to compare str literals

Author: MikeTheWatchGuy

DemoPrograms/Demo_Button_States.py

@@ -46,6 +46,6 @@
         [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 @@
     event, values = window.Read()
     if event is None:
         break
-    if event is 'Blue':
-        window.FindElement('canvas').TKCanvas.itemconfig(cir, fill = "Blue")
-    elif event is 'Red':
-        window.FindElement('canvas').TKCanvas.itemconfig(cir, fill = "Red")
+    if event in ('Blue', 'Red'):
+        window.FindElement('canvas').TKCanvas.itemconfig(cir, fill=event)

DemoPrograms/Demo_Chat.py

@@ -11,7 +11,7 @@
 To see this program RUN on the web go here:
 https://repl.it/@PySimpleGUI/Chat-Application-Demo
 
-Note that the size of the display on repl.it is smaller than most, so the sizes of the 
+Note that the size of the display on repl.it is smaller than most, so the sizes of the
 Multiline and Output text areas were reduced in the online version.  Nothing else was changed
 '''
 
@@ -31,7 +31,7 @@
 # ---===--- 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,15 +33,15 @@ 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))
             command_history.append(query)
             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

@@ -12,7 +12,7 @@
 '''
 Demo_Chatterbot.py
 A GUI wrapped arouind the Chatterbot package.
-The GUI is used to show progress bars during the training process and 
+The GUI is used to show progress bars during the training process and
 to collect user input that is sent to the chatbot.  The reply is displayed in the GUI window
 '''
 
@@ -67,7 +67,7 @@ def print_progress_bar(description, iteration_counter, total_items, progress_bar
 # ---===--- 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

@@ -16,7 +16,7 @@
 '''
 Demo_Chatterbot.py
 A GUI wrapped arouind the Chatterbot package.
-The GUI is used to show progress bars during the training process and 
+The GUI is used to show progress bars during the training process and
 to collect user input that is sent to the chatbot.  The reply is displayed in the GUI window
 '''
 
@@ -87,7 +87,7 @@ def speak(text):
 # ---===--- 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

@@ -8,13 +8,13 @@
 
 """
  Timer Desktop Widget Creates a floating timer that is always on top of other windows You move it by grabbing anywhere on the window Good example of how to do a non-blocking, polling program using SimpleGUI Can be used to poll hardware when running on a Pi
- 
+
  While the timer ticks are being generated by PySimpleGUI's "timeout" mechanism, the actual value
   of the timer that is displayed comes from the system timer, time.time().  This guarantees an
   accurate time value is displayed regardless of the accuracy of the PySimpleGUI timer tick. If
   this design were not used, then the time value displayed would slowly drift by the amount of time
-  it takes to execute the PySimpleGUI read and update calls (not good!)     
- 
+  it takes to execute the PySimpleGUI read and update calls (not good!)
+
  NOTE - you will get a warning message printed when you exit using exit button.
  It will look something like: invalid command name \"1616802625480StopMove\"
 """
@@ -46,9 +46,9 @@
     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 @@
     event, values = window.Read()
     if event is None:
         break
-    if event is 'Blue':
-        graph.TKCanvas.itemconfig(circle, fill = "Blue")
-    elif event is 'Red':
-        graph.TKCanvas.itemconfig(circle, fill = "Red")
-    elif event is 'Move':
+    if event in ('Blue', 'Red'):
+        graph.TKCanvas.itemconfig(circle, fill=event)
+    elif event == 'Move':
         graph.MoveFigure(point, 10,10)
         graph.MoveFigure(circle, 10,10)
         graph.MoveFigure(oval, 10,10)