Merge pull request #24 from leviolet/master

修改newclinet-py3.py,适配linux(WSL)
drcoms · Sep 1, 2020 · 2ba09ce · 2ba09ce
2 parents 5bab512 + 6d1a90d
commit 2ba09ce
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -4,6 +4,7 @@
 [submodule "dr-jlu-win32"]
 	path = dr-jlu-win32
 	url = https://github.com/ImFengLala/dr-jlu-win32
-[submodule "jlu-drcom-csharp"]
-	path = jlu-drcom-csharp
+
+[submodule "jlu-drcom-dotnet"]
+	path = jlu-drcom-dotnet
 	url = https://github.com/leviolet/DrcomDotnet
diff --git a/jlu-drcom-csharp b/jlu-drcom-csharp
diff --git a/jlu-drcom-dotnet b/jlu-drcom-dotnet
diff --git a/jlu-drcom-py3/newclinet-py3.py b/jlu-drcom-py3/newclinet-py3.py
@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 # coding:   utf-8
 # license:  AGPL-V3
+# tested:   Windows 10, WSL 1
 
 import re
 import socket
@@ -87,7 +88,7 @@ def log(*args, **kwargs):
     print(*args, **kwargs)
     if DEBUG and platform.uname().system != 'Windows':
         with open(LOG_PATH,'a') as f:
-            f.write(s + '\n')
+            f.write(str(s) + '\n')
 
 
 def challenge(svr, ran):
@@ -370,7 +371,8 @@ def daemon():
 def main():
     if not IS_TEST:
         daemon()
-        execfile(CONF, globals())
+        with open(CONF) as f:
+            exec(f.read(), globals())
     log("auth svr:", server, "\nusername:", username , 
         "\npassword:", password, "\nmac:", str(hex(mac)))
     log(bind_ip)