Jelajahi Sumber

Fix encodings issue with pdeploy, I hope

rdb 15 tahun lalu
induk
melakukan
cc7b6642e5
2 mengubah file dengan 2 tambahan dan 1 penghapusan
  1. 2 0
      direct/src/p3d/DeploymentTools.py
  2. 0 1
      direct/src/p3d/panda3d.pdef

+ 2 - 0
direct/src/p3d/DeploymentTools.py

@@ -10,6 +10,8 @@ from direct.showbase.AppRunnerGlobal import appRunner
 from pandac.PandaModules import PandaSystem, HTTPClient, Filename, VirtualFileSystem, Multifile
 from pandac.PandaModules import PandaSystem, HTTPClient, Filename, VirtualFileSystem, Multifile
 from pandac.PandaModules import TiXmlDocument, TiXmlDeclaration, TiXmlElement, readXmlStream
 from pandac.PandaModules import TiXmlDocument, TiXmlDeclaration, TiXmlElement, readXmlStream
 from direct.p3d.HostInfo import HostInfo
 from direct.p3d.HostInfo import HostInfo
+# This is important for some reason
+import encodings
 
 
 class CachedFile:
 class CachedFile:
     def __init__(self): self.str = ""
     def __init__(self): self.str = ""

+ 0 - 1
direct/src/p3d/panda3d.pdef

@@ -360,7 +360,6 @@ class pdeploy(p3d):
            hidden = True, platform_specific = False,
            hidden = True, platform_specific = False,
            keep_user_env = True)
            keep_user_env = True)
     require('panda3d')
     require('panda3d')
-    require('morepy')
 
 
     module('encodings', 'encodings.zlib_codec', 'encodings.bz2_codec')
     module('encodings', 'encodings.zlib_codec', 'encodings.bz2_codec')
     mainModule('direct.p3d.pdeploy')
     mainModule('direct.p3d.pdeploy')