- miniterm now asks for the port if none is given (instead of opening '0')

- update py2exe scripts (ensure own module is taken not the one in site-packages)

git-svn-id: http://svn.code.sf.net/p/pyserial/code/trunk/pyserial@452 f19166aa-fa4f-0410-85c2-fa1106f25c8a

3 files changed, 14 insertions, 11 deletions

diff --git a/examples/setup-miniterm-py2exe.py b/examples/setup-miniterm-py2exe.py
index 60539ec..c98e4bd 100644
--- a/examples/setup-miniterm-py2exe.py
+++ b/examples/setup-miniterm-py2exe.py
@@ -4,7 +4,7 @@
 from distutils.core import setup
 import glob, sys, py2exe, os
 
-sys.path.append('..')
+sys.path.insert(0, '..')
 
 sys.argv.extend("py2exe --bundle 1".split())
 
diff --git a/examples/setup-rfc2217_server-py2exe.py b/examples/setup-rfc2217_server-py2exe.py
index 020427e..e4e6d68 100644
--- a/examples/setup-rfc2217_server-py2exe.py
+++ b/examples/setup-rfc2217_server-py2exe.py
@@ -4,7 +4,7 @@
 from distutils.core import setup
 import glob, sys, py2exe, os
 
-sys.path.append('..')
+sys.path.insert(0, '..')
 
 sys.argv.extend("py2exe --bundle 1".split())
 
diff --git a/serial/tools/miniterm.py b/serial/tools/miniterm.py
index fdf4d8e..626c5aa 100644
--- a/serial/tools/miniterm.py
+++ b/serial/tools/miniterm.py
@@ -141,6 +141,14 @@ else:
     raise NotImplementedError("Sorry no implementation for your platform (%s) available." % sys.platform)
 
 
+def dump_port_list():
+    if comports:
+        sys.stderr.write('\n--- Available ports:\n')
+        for port, desc, hwid in sorted(comports()):
+            #~ sys.stderr.write('--- %-20s %s [%s]\n' % (port, desc, hwid))
+            sys.stderr.write('--- %-20s %s\n' % (port, desc))
+
+
 CONVERT_CRLF = 2
 CONVERT_CR   = 1
 CONVERT_LF   = 0
@@ -222,13 +230,6 @@ class Miniterm(object):
                 REPR_MODES[self.repr_mode],
                 LF_MODES[self.convert_outgoing]))
 
-    def dump_port_list(self):
-        if comports:
-            sys.stderr.write('\n--- Available ports:\n')
-            for port, desc, hwid in sorted(comports()):
-                #~ sys.stderr.write('--- %-20s %s [%s]\n' % (port, desc, hwid))
-                sys.stderr.write('--- %-20s %s\n' % (port, desc))
-
     def reader(self):
         """loop and copy serial->console"""
         try:
@@ -345,7 +346,7 @@ class Miniterm(object):
                             LF_MODES[self.convert_outgoing],
                         ))
                     elif c in 'pP':                         # P -> change port
-                        self.dump_port_list()
+                        dump_port_list()
                         sys.stderr.write('--- Enter port name: ')
                         sys.stderr.flush()
                         console.cleanup()
@@ -599,7 +600,9 @@ def main():
         if args:
             parser.error("too many arguments")
     else:
-        if port is None: port = 0
+        if port is None:
+            dump_port_list()
+            port = raw_input('Enter port name:')
 
     convert_outgoing = CONVERT_CRLF
     if options.cr: