better packaging

MANIFEST.in

@@ -1 +1 @@
-include zhcdict.json
+include zhconv/zhcdict.json

setup.py

@@ -1,17 +1,17 @@
-import os
-
 try:
     from setuptools import setup
 except ImportError:
     from distutils.core import setup
 
 setup(
     name='zhconv',
-    version='1.1.0',
+    version='1.1.1',
     description="A simple implementation of Chinese S-T conversion.",
     author='Dingyuan Wang',
     author_email='abcdoyle888@gmail.com',
-    py_modules=['zhconv'],
+    packages=['zhconv'],
+    include_package_data=True,
+    platforms='any',
     classifiers=[
         'Development Status :: 4 - Beta',
         'Intended Audience :: Developers',
@@ -24,6 +24,5 @@
         "Programming Language :: Python :: 2",
         "Programming Language :: Python :: 3",
     ],
-    url='https://github.com/gumblex/zhconv',
-    data_files=[('', ['zhcdict.json'])]
+    url='https://github.com/gumblex/zhconv'
 )

zhconv/__init__.py

@@ -0,0 +1 @@
+from .zhconv import *

zhconv/__main__.py

@@ -0,0 +1,5 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+from .zhconv import main
+main()

zhcdict.json → zhconv/zhcdict.json

@@ -19074,4 +19074,4 @@
 "點裏": "點裡",
 "鼠标": "滑鼠"
 }
-}
+}

zhconv.py → zhconv/zhconv.py

@@ -399,7 +399,8 @@ def main():
         locale = sys.argv[2]
         convertfunc = convert_for_mw
     else:
-        print("usage: %s [-w] {zh-cn|zh-tw|zh-hk|zh-sg|zh-hans|zh-hant|zh} < input > output" % __file__)
+        thisfile = __file__ if __name__ == '__main__' else 'python -mzhconv'
+        print("usage: %s [-w] {zh-cn|zh-tw|zh-hk|zh-sg|zh-hans|zh-hant|zh} < input > output" % thisfile)
         sys.exit(1)
 
     loaddict()