Modified freeze_modules to accept recursive modules with pyfile

The pyfile that is specified in the module metadata wasn't allowed to be
a folder. This is a problem to us, as the gdb module is not a single
python file.

These modifications allow people to add pyfile recursive dirs from
non-Lib locations.

Also modified deep_freeze.py to accept surrogates in text it receives.
Not sure why it received surrogates though, something from pygments.

Author: roddyrap

Tools/build/deepfreeze.py

@@ -222,7 +222,7 @@ def generate_unicode(self, name: str, s: str) -> str:
                             self.write(".compact = 1,")
                             self.write(".ascii = 0,")
                             self.write(".statically_allocated = 1,")
-                    utf8 = s.encode('utf-8')
+                    utf8 = s.encode('utf-8', 'surrogatepass')
                     self.write(f'.utf8 = {make_string_literal(utf8)},')
                     self.write(f'.utf8_length = {len(utf8)},')
                 with self.block(f"._data =", ","):

Tools/build/freeze_modules.py

@@ -321,19 +321,18 @@ def _parse_spec(spec, knownids=None, section=None):
         else:
             pyfile = _resolve_module(frozenid, ispkg=False)
         ispkg = True
-    elif pyfile:
+    elif pyfile and not os.path.isdir(pyfile):
         assert check_modname(frozenid), spec
         assert not knownids or frozenid not in knownids, spec
         assert check_modname(modname), spec
-        assert not os.path.isdir(pyfile), spec
         ispkg = False
     elif knownids and frozenid in knownids:
         assert check_modname(frozenid), spec
         assert check_modname(modname), spec
         ispkg = False
     else:
         assert not modname or check_modname(modname), spec
-        resolved = iter(resolve_modules(frozenid))
+        resolved = iter(resolve_modules(frozenid, pyfile if os.path.isdir(pyfile) else None))
         frozenid, pyfile, ispkg = next(resolved)
         if not modname:
             modname = frozenid