소스 검색

Remove __version__.py

Lutz Roeder 3 년 전
부모
커밋
9feb28df1a
4개의 변경된 파일6개의 추가작업 그리고 5개의 파일을 삭제
  1. 1 1
      publish/python.py
  2. 1 1
      source/__init__.py
  3. 0 1
      source/__version__.py
  4. 4 2
      source/server.py

+ 1 - 1
publish/python.py

@@ -39,7 +39,7 @@ def version():
     ''' Update version '''
     package = json.loads(read('./package.json'))
     update('./dist/pypi/setup.py', '(    version=")(.*)(",)', package['version'])
-    update('./dist/pypi/netron/__version__.py',
+    update('./dist/pypi/netron/server.py',
         "(__version__ = ')(.*)(')",
         package['version'])
     update('./dist/pypi/netron/index.html',

+ 1 - 1
source/__init__.py

@@ -9,7 +9,7 @@ from .server import stop
 from .server import status
 from .server import wait
 from .server import serve
-from .__version__ import __version__
+from .server import __version__
 
 def main():
     ''' main entry point '''

+ 0 - 1
source/__version__.py

@@ -1 +0,0 @@
-__version__ = '0.0.0'

+ 4 - 2
source/server.py

@@ -15,7 +15,7 @@ import time
 import webbrowser
 import urllib.parse
 
-from .__version__ import __version__
+__version__ = '0.0.0'
 
 class HTTPRequestHandler(http.server.BaseHTTPRequestHandler):
     ''' HTTP Request Handler '''
@@ -46,7 +46,7 @@ class HTTPRequestHandler(http.server.BaseHTTPRequestHandler):
         status_code = 0
         headers = {}
         buffer = None
-        if path == '/' or path == '/index.html':
+        if path in ('/', '/index.html'):
             meta = []
             meta.append('<meta name="type" content="Python">')
             meta.append('<meta name="version" content="' + __version__ + '">')
@@ -145,6 +145,7 @@ class HTTPServerThread(threading.Thread):
         self.stop_event.clear()
 
     def stop(self):
+        ''' Stop server '''
         if self.alive():
             sys.stdout.write("Stopping " + self.url + "\n")
             self.stop_event.set()
@@ -152,6 +153,7 @@ class HTTPServerThread(threading.Thread):
             self.terminate_event.wait(1000)
 
     def alive(self):
+        ''' Check server status '''
         return not self.terminate_event.is_set()
 
 _thread_list = []