Change mixer to use FileNotFoundError and fix related tests (#2001)

* Change pygame.error to FIleNotFoundError
* fix test failing incorrectly
* Fix related test
* Update docs to reflect changes
* Remove unnecessary error assignment
* Remove unused variables

Author: Temmie3754

docs/reST/ref/music.rst

@@ -34,6 +34,7 @@ MP3 in most cases.
    the type of music data in the object. For example: :code:`load(fileobj, "ogg")`.
 
    .. versionchanged:: 2.0.2 Added optional ``namehint`` argument
+   .. versionchanged:: 2.2.0 Raises ``FileNotFoundError`` instead of :exc:`pygame.error` if file cannot be found
 
    .. ## pygame.mixer.music.load ##
 
@@ -243,6 +244,7 @@ MP3 in most cases.
        pygame.mixer.music.queue('mozart.ogg')
 
    .. versionchanged:: 2.0.2 Added optional ``namehint`` argument
+   .. versionchanged:: 2.2.0 Raises ``FileNotFoundError`` instead of :exc:`pygame.error` if file cannot be found
 
    .. ## pygame.mixer.music.queue ##
 

src_c/music.c

@@ -375,19 +375,11 @@ _load_music(PyObject *obj, char *namehint)
     Mix_Music *new_music = NULL;
     char *ext = NULL, *type = NULL;
     SDL_RWops *rw = NULL;
-    PyObject *_type = NULL;
-    PyObject *error = NULL;
-    PyObject *_traceback = NULL;
 
     MIXER_INIT_CHECK();
 
     rw = pgRWops_FromObject(obj, &ext);
-    if (rw ==
-        NULL) { /* stop on NULL, error already set is what we SHOULD do */
-        PyErr_Fetch(&_type, &error, &_traceback);
-        PyErr_SetObject(pgExc_SDLError, error);
-        Py_XDECREF(_type);
-        Py_XDECREF(_traceback);
+    if (rw == NULL) {
         return NULL;
     }
     if (namehint) {

test/mixer_music_test.py

@@ -174,7 +174,7 @@ def test_queue__invalid_sound_type(self):
 
     def test_queue__invalid_filename(self):
         """Ensures queue() correctly handles invalid filenames."""
-        with self.assertRaises(pygame.error):
+        with self.assertRaises(FileNotFoundError):
             pygame.mixer.music.queue("")
 
     def test_music_pause__unpause(self):

test/mixer_test.py

@@ -93,7 +93,7 @@ def test_get_init__returns_exact_values_used_for_init(self):
             frequency, size, channels = init_conf.values()
             if (frequency, size) == (22050, 16):
                 continue
-            mixer.init(frequency, size, channels)
+            mixer.init(frequency, size, channels, allowedchanges=0)
 
             mixer_conf = mixer.get_init()