Backports for 7.2.0 and update changelog (#838)

* CLN : Remove commented out/dead code (#833)

* Update image license files (#818)

* DEV : Add CC-BY-3.0 license file

and include it in the pyface distribution

	new file:   LICENSE-CC-BY-3.0.txt
	modified:   MANIFEST.in

* DEV : Move license content to main image license file

and delete the now redundant license file

	deleted:    examples/application/python_editor/images/image_LICENSE.txt
	modified:   image_LICENSE.txt

* DEV : Move more license information to top level image license file

	deleted:    examples/application/python_shell/images/image_LICENSE.txt
	modified:   image_LICENSE.txt

* DEV : More more license info into image license file

and remove the duplicate info file

	deleted:    examples/data_view/images/image_LICENSE.txt
	modified:   image_LICENSE.txt

* DEV : More more license info into top level image license file

	deleted:    examples/dock/images/image_LICENSE.txt
	modified:   image_LICENSE.txt

* DEV : More some more license info into top level license file

	deleted:    examples/images/image_LICENSE.txt
	modified:   image_LICENSE.txt

* DEV : Move some more license info into top level image license file

	deleted:    examples/tasks/advanced/images/image_LICENSE.txt
	modified:   image_LICENSE.txt

* DEV : Move more license info into top level image license file

	deleted:    examples/tasks/basic/images/image_LICENSE.txt
	modified:   image_LICENSE.txt

* CLN : Remove redundant license file

	deleted:    examples/workbench/images/image_LICENSE.txt

* CLN : Remove outdated/redundant license file

	deleted:    pyface/action/images/image_LICENSE.txt

* CLN : Remove redundant/outdated image license file

	deleted:    pyface/dock/images/image_LICENSE.txt

* DEV : Move more license info to top level image license file

	modified:   image_LICENSE.txt
	deleted:    pyface/images/image_LICENSE.txt

* DEV : More more license info to top level image license file

	modified:   image_LICENSE.txt
	deleted:    pyface/tests/images/image_LICENSE.txt

* DEV : Move more license info to top level image license file

	modified:   image_LICENSE.txt
	deleted:    pyface/tree/images/image_LICENSE.txt

* CLN : Remove another redundant/unnecessary image license file

	deleted:    pyface/ui/qt4/images/image_LICENSE.txt

* CLN : Remove unnecessary/redundant image license file

	deleted:    pyface/ui/wx/grid/images/image_LICENSE.txt

* DEV : More more license info to top level image license file

	modified:   image_LICENSE.txt
	deleted:    pyface/ui/wx/images/image_LICENSE.txt

* CLN : Remove duplicate information

	modified:   image_LICENSE.txt

* CLN : Remove Enthought-licensed content from image license file

	modified:   image_LICENSE.txt

* Fix loading resource images from a module that is not a package (#836)

* Fix loading resource files from a module that is not a package

* Replace module name with just the module

This is an optimization but is also safer:
importlib_resources will resolve the module name back to the module.

* Change IOError to OSError to be consistent

Since Python 3.3, IOError is simply alias of OSError

* update changelog with relevant backported PR

* Revert "update changelog with relevant backported PR"

This reverts commit 9b3cf77.

Co-authored-by: Poruri Sai Rahul <rporuri@enthought.com>
Co-authored-by: Kit Choi <kitchoi@users.noreply.github.com>

Author: 3 people

LICENSE-CC-BY-3.0.txt

@@ -2,6 +2,7 @@ include image_LICENSE.txt
 include image_LICENSE_Eclipse.txt
 include image_LICENSE_Nuvola.txt
 include image_LICENSE_OOo.txt
+include LICENSE-CC-BY-3.0.txt
 include LICENSE.txt
 include README.rst
 include MANIFEST.in

MANIFEST.in

@@ -5,76 +5,84 @@ Project                 License                   File
 ----------------------------------------------------------------------------
 Eclipse                 Eclipse Public License    image_LICENSE_Eclipse.txt
 Enthought               BSD 3-Clause              LICENSE.txt
+FamFamFam Flags         Public Domain             http://www.famfamfam.com/lab/icons/flags/
 GV (Gael Varoquaux)     Public Domain             N/A
 Nuvola                  LGPL                      image_LICENSE_Nuvola.txt
 OOo                     LGPL                      image_LICENSE_OOo.txt
+Oxygen                  CC-SA 3.0                 LICENSE-CC-BY-3.0.txt
+PSF                     Trademark                 https://www.python.org/community/logos/
 
 Unless stated in this file, icons are the work of Enthought, and are
 released under a 3 clause BSD license.
 
 Files and orginal authors:
 ----------------------------------------------------------------------------
+examples/application/python_editor/images:
+                   document_new.png | Oxygen
+                  document_open.png | Oxygen
+                  document_save.png | Oxygen
+                    python_icon.png | PSF
+                    python_logo.png | PSF
+
+examples/application/python_shell/images:
+                    python_icon.png | PSF
+                    python_logo.png | PSF
+
+examples/data_view/images:
+                             ca.png | FamFamFam Flags
+                             gb.png | FamFamFam Flags
+                             us.png | FamFamFam Flags
+
+examples/dock/images:
+                         folder.png | Nuvola
+                           gear.png | Nuvola
+
+examples/images:
+            closed_folder_24x24.png | Nuvola
+                  closed_folder.png | Nuvola
+                       document.png | GV
+                    open_folder.png | Nuvola
+
+examples/tasks/advanced/images:
+                   document_new.png | Oxygen
+                  document_open.png | Oxygen
+                  document_save.png | Oxygen
+
+examples/tasks/basic/images:
+                  document_open.png | Oxygen
+                  document_save.png | Oxygen
+
 pyface/action/images:
                          action.png | Eclipse
 
-pyface/images:
-                          about.jpg | Enthought
-                     background.jpg | Enthought
-                    caret_close.png | Enthought
-                     caret_open.png | Enthought
-                          close.png | GV
-                image_not_found.png | Nuvola
-                 panel_gradient.png | Enthought
-            panel_gradient_over.png | Enthought
-                       question.png | GV
-                         splash.png | Enthought
-
 pyface/dock/images:
-            bar_feature_changed.png | Enthought
-           bar_feature_disabled.png | Enthought
-               bar_feature_drop.png | Enthought
-            bar_feature_no_drop.png | Enthought
-             bar_feature_normal.png | Enthought
                      close_drag.png | GV
                       close_tab.png | GV
                    feature_tool.png | GV
-                      sh_bottom.png | Enthought
-                      sh_middle.png | Enthought
-                         sh_top.png | Enthought
-                          shell.ico | Enthought
-                        sv_left.png | Enthought
-                      sv_middle.png | Enthought
-                       sv_right.png | Enthought
-            tab_feature_changed.png | Enthought
-           tab_feature_disabled.png | Enthought
-               tab_feature_drop.png | Enthought
             tab_feature_no_drop.png | OOo
              tab_feature_normal.png | OOo
-                   tab_scroll_l.png | Enthought
-                  tab_scroll_lr.png | Enthought
-                   tab_scroll_r.png | Enthought
                          window.png | Eclipse
 
-pyface/ui/wx/grid/images:
-                        checked.png | GV
+pyface/images:
+                          about.jpg | Python Software Foundation
+                          close.png | GV
                 image_not_found.png | Nuvola
-                     table_edit.png | OOo
-                      unchecked.png | GV
+                       question.png | GV
+                         splash.png | Python Software Foundation
 
-pyface/tree/images:
-                  closed_folder.png | Nuvola
-                       document.png | GV
-                    open_folder.png | Nuvola
+pyface/tests/images:
+                           core.png | Nuvola
 
-examples/images:
-            closed_folder_24x24.png | Nuvola
+pyface/tree/images:
                   closed_folder.png | Nuvola
                        document.png | GV
                     open_folder.png | Nuvola
 
-examples/dock/images:
-                         folder.png | Nuvola
-                           gear.png | Nuvola
+pyface/ui/wx/grid/images:
+                        checked.png | GV
+                image_not_found.png | Nuvola
+                     table_edit.png | OOo
+                      unchecked.png | GV
 
-examples/workbench/images:
-                        example.ico | Enthought
+pyface/ui/wx/images:
+                        warning.png | GV

examples/application/python_editor/images/image_LICENSE.txt

@@ -112,12 +112,6 @@ def __init__(self, *args, **traits):
             # Otherwise, the item is an action manager item so add it to the
             # current group.
             else:
-                ##                 # If no group has been created then add one.  This is only
-                ##                 # relevant when using the 'shorthand' way to define menus.
-                ##                 if group is None:
-                ##                     group = Group(id='__first__')
-                ##                     self.insert(-1, group)
-
                 group.append(arg)
 
     # ------------------------------------------------------------------------