Scripts conflicted with can-utils

hardbyte · hardbyte · commit 0bba2127ab8d · 2017-06-17T08:47:25.000+10:00
Fixes hardbyte#162
diff --git a/can/logger.py b/can/logger.py
@@ -0,0 +1,3 @@
+from can.io import logger
+
+logger.main()
diff --git a/can/player.py b/can/player.py
@@ -0,0 +1,3 @@
+from can.io import player
+
+player.main()
diff --git a/can/server.py b/can/server.py
@@ -0,0 +1,3 @@
+from can.interfaces.remote import __main__
+
+__main__.main()
diff --git a/doc/bin.rst b/doc/bin.rst
@@ -1,12 +1,12 @@
 Scripts
 =======
 
-The following scripts are installed along with python-can.
+The following modules are callable from python-can.
 
-canlogger
----------
+can.logger
+----------
 
-Command line help (``canlogger --help`` or ``python -m can.io.logger --help``)::
+Command line help (``python -m can.logger --help``)::
 
     usage: canlogger [-h] [-f LOG_FILE] [-v] [-c CHANNEL]
                     [-i {pcan,remote,ixxat,socketcan_ctypes,virtual,usb2can,nican,serial,kvaser,socketcan,socketcan_native}]
@@ -37,10 +37,10 @@ Command line help (``canlogger --help`` or ``python -m can.io.logger --help``)::
                             mask != can_id & mask)
 
 
-canplayer
----------
+can.player
+----------
 
-Command line help (``canplayer --help`` or ``python -m can.io.player --help``)::
+Command line help (``python -m can.player --help``)::
 
     usage: canplayer [-h] [-f LOG_FILE] [-v] [-c CHANNEL]
                     [-i {pcan,remote,ixxat,socketcan_ctypes,virtual,usb2can,nican,serial,kvaser,socketcan,socketcan_native}]
@@ -75,10 +75,10 @@ Command line help (``canplayer --help`` or ``python -m can.io.player --help``)::
 
 
 
-canserver
----------
+can.server
+----------
 
-Command line help (``canserver --help`` or ``python -m can.interfaces.remote --help``)::
+Command line help (``python -m can.server --help``)::
 
       usage: canserver [-h] [-v] [-c CHANNEL]
                       [-i {pcan,remote,ixxat,socketcan_ctypes,virtual,usb2can,nican,serial,kvaser,socketcan,socketcan_native}]
diff --git a/setup.py b/setup.py
@@ -26,12 +26,6 @@
         "": ["CONTRIBUTORS.txt", "LICENSE.txt"],
         "doc": ["*.*"]
     },
-    entry_points={"console_scripts": [
-        "canlogger = can.io.logger:main",
-        "canplayer = can.io.player:main",
-        "canserver = can.interfaces.remote.__main__:main"
-    ]},
-
     # Tests can be run using `python setup.py test`
     test_suite="nose.collector",
     tests_require=['mock', 'nose']

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+from can.io import logger`
	`2`	`+`
	`3`	`+logger.main()`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+from can.io import player`
	`2`	`+`
	`3`	`+player.main()`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+from can.interfaces.remote import __main__`
	`2`	`+`
	`3`	`+__main__.main()`