Merge pull request #2839 from pygame-community/permissive-converting

relax convert conditions

Author: robertpfeiffer

docs/reST/ref/surface.rst

@@ -247,6 +247,8 @@
       as Surface subclass inherit this method without the need to override,
       unless subclass specific instance attributes also need copying.
 
+      .. versionchanged:: 2.5.0 converting to a known format will succeed without a window/display surface.
+
       .. ## Surface.convert ##
 
    .. method:: convert_alpha

src_c/surface.c

@@ -1423,13 +1423,14 @@ surf_convert(pgSurfaceObject *self, PyObject *args)
     Uint8 key_r, key_g, key_b, key_a = 255;
     int has_colorkey = SDL_FALSE;
 
-    if (!SDL_WasInit(SDL_INIT_VIDEO))
-        return RAISE(pgExc_SDLError,
-                     "cannot convert without pygame.display initialized");
-
     if (!PyArg_ParseTuple(args, "|Oi", &argobject, &flags))
         return NULL;
 
+    if (!argobject && !SDL_WasInit(SDL_INIT_VIDEO))
+        return RAISE(pgExc_SDLError,
+                     "cannot convert without format "
+                     "when pygame.display is not initialized");
+
     SURF_INIT_CHECK(surf)
 
     pgSurface_Prep(self);

test/surface_test.py

@@ -1215,8 +1215,6 @@ def test_image_convert_bug_131(self):
 
         pygame.display.init()
         try:
-            pygame.display.set_mode((640, 480))
-
             im = pygame.image.load(example_path(os.path.join("data", "city.png")))
             im2 = pygame.image.load(example_path(os.path.join("data", "brick.png")))
 
@@ -1246,7 +1244,7 @@ def test_convert_init(self):
         filename = example_path(os.path.join("data", "alien3.png"))  # 8bit PNG
         surf8bit = pygame.image.load(filename)
 
-        self.assertRaisesRegex(pygame.error, "display initialized", surf.convert)
+        self.assertRaisesRegex(pygame.error, "display is not initialized", surf.convert)
 
         pygame.display.init()
         try:
@@ -1308,8 +1306,6 @@ def test_convert_alpha_SRCALPHA(self):
     def test_convert_palettize(self):
         pygame.display.init()
         try:
-            pygame.display.set_mode((640, 480))
-
             surf = pygame.Surface((150, 250))
             surf.fill((255, 50, 0))
             surf = surf.convert(8)