Changeset 206 for etherws/trunk

Timestamp:

08/03/12 01:18:11 (12 years ago)

Author:

atzm

Message:

• hide internal functions

Location:

etherws/trunk

Files:

• etherws.py (modified) (10 diffs)
• setup.py (modified) (1 diff)

etherws/trunk/etherws.py

@@ -642 +642 @@
 
 
-def print_error(error):
+def _print_error(error):
     print('  %s (%s)' % (error['message'], error['code']))
     print('    %s' % error['data'])
 
 
-def start_sw(args):
+def _start_sw(args):
     def daemonize(nochdir=False, noclose=False):
         if os.fork() > 0:
@@ -781 +781 @@
 
 
-def start_ctl(args):
+def _start_ctl(args):
     def request(args, method, params=None, id_=0):
         req = urllib2.Request(args.ctlurl)
@@ -837 +837 @@
         })
         if 'error' in result:
-            print_error(result['error'])
+            _print_error(result['error'])
         else:
             print_portlist(result['result']['entries'])
@@ -849 +849 @@
         })
         if 'error' in result:
-            print_error(result['error'])
+            _print_error(result['error'])
         else:
             print_portlist(result['result']['entries'])
@@ -858 +858 @@
         result = request(args, 'delPort', {'port': args.port})
         if 'error' in result:
-            print_error(result['error'])
+            _print_error(result['error'])
         else:
             print_portlist(result['result']['entries'])
@@ -865 +865 @@
         result = request(args, 'listPort')
         if 'error' in result:
-            print_error(result['error'])
+            _print_error(result['error'])
         else:
             print_portlist(result['result']['entries'])
@@ -872 +872 @@
         result = request(args, 'listFdb')
         if 'error' in result:
-            return print_error(result['error'])
+            return _print_error(result['error'])
         result = result['result']['entries']
         pmax = maxlen(result, 'port', 4)
@@ -886 +886 @@
 
 
-def main():
+def _main():
     parser = argparse.ArgumentParser()
     subcommand = parser.add_subparsers(dest='subcommand')
@@ -956 +956 @@
 
     try:
-        globals()['start_' + args.subcommand](args)
+        globals()['_start_' + args.subcommand](args)
     except Exception as e:
-        print_error({
+        _print_error({
             'code':    0 - 32603,
             'message': 'Internal error',
@@ -966 +966 @@
 
 if __name__ == '__main__':
-    main()
+    _main()

etherws/trunk/setup.py

@@ -43 +43 @@
     author_email='atzm@atzm.org',
     license='BSD-2',
-    entry_points={'console_scripts': ['etherws = etherws:main']},
+    entry_points={'console_scripts': ['etherws = etherws:_main']},
     py_modules=['etherws'],
     keywords=['http', 'websocket', 'ethernet', 'network'],