Squashed 'tools/third_party/pywebsocket3/' changes from e0d3b5a519..49ae4cba89

49ae4cba89 Fix Sphinx errors
115f9a6f7c Add .gitignore file
b1ef45f362 Simplify some uses of os.path.split
faf478a045 Add UnitTests for standalone server
3ae555c3fa Update optparse to argparse

git-subtree-dir: tools/third_party/pywebsocket3
git-subtree-split: 49ae4cba89a81ddc55a29d7365f2f18434b0ea9f

Author: Hexcles

.gitignore

@@ -0,0 +1,4 @@
+*.pyc
+build/
+*.egg-info/
+dist/

README.md

@@ -10,7 +10,7 @@ Run this to read the general document:
 $ pydoc mod_pywebsocket
 ```
 
-Please see [Wiki](../../wiki) for more details.
+Please see [Wiki](https://github.com/GoogleChromeLabs/pywebsocket3/wiki) for more details.
 
 # INSTALL #
 

example/echo_client.py

@@ -51,7 +51,7 @@
 import codecs
 from hashlib import sha1
 import logging
-from optparse import OptionParser
+import argparse
 import os
 import random
 import re
@@ -602,76 +602,78 @@ def main():
     if six.PY2:
         sys.stdout = codecs.getwriter('utf-8')(sys.stdout)
 
-    parser = OptionParser()
+    parser = argparse.ArgumentParser()
     # We accept --command_line_flag style flags which is the same as Google
     # gflags in addition to common --command-line-flag style flags.
-    parser.add_option('-s',
-                      '--server-host',
-                      '--server_host',
-                      dest='server_host',
-                      type='string',
-                      default='localhost',
-                      help='server host')
-    parser.add_option('-p',
-                      '--server-port',
-                      '--server_port',
-                      dest='server_port',
-                      type='int',
-                      default=_UNDEFINED_PORT,
-                      help='server port')
-    parser.add_option('-o',
-                      '--origin',
-                      dest='origin',
-                      type='string',
-                      default=None,
-                      help='origin')
-    parser.add_option('-r',
-                      '--resource',
-                      dest='resource',
-                      type='string',
-                      default='/echo',
-                      help='resource path')
-    parser.add_option('-m',
-                      '--message',
-                      dest='message',
-                      type='string',
-                      help=('comma-separated messages to send. '
-                            '%s will force close the connection from server.' %
-                            _GOODBYE_MESSAGE))
-    parser.add_option('-q',
-                      '--quiet',
-                      dest='verbose',
-                      action='store_false',
-                      default=True,
-                      help='suppress messages')
-    parser.add_option('-t',
-                      '--tls',
-                      dest='use_tls',
-                      action='store_true',
-                      default=False,
-                      help='use TLS (wss://).')
-    parser.add_option('-k',
-                      '--socket-timeout',
-                      '--socket_timeout',
-                      dest='socket_timeout',
-                      type='int',
-                      default=_TIMEOUT_SEC,
-                      help='Timeout(sec) for sockets')
-    parser.add_option('--use-permessage-deflate',
-                      '--use_permessage_deflate',
-                      dest='use_permessage_deflate',
-                      action='store_true',
-                      default=False,
-                      help='Use the permessage-deflate extension.')
-    parser.add_option('--log-level',
-                      '--log_level',
-                      type='choice',
-                      dest='log_level',
-                      default='warn',
-                      choices=['debug', 'info', 'warn', 'error', 'critical'],
-                      help='Log level.')
-
-    (options, unused_args) = parser.parse_args()
+    parser.add_argument('-s',
+                        '--server-host',
+                        '--server_host',
+                        dest='server_host',
+                        type=six.text_type,
+                        default='localhost',
+                        help='server host')
+    parser.add_argument('-p',
+                        '--server-port',
+                        '--server_port',
+                        dest='server_port',
+                        type=int,
+                        default=_UNDEFINED_PORT,
+                        help='server port')
+    parser.add_argument('-o',
+                        '--origin',
+                        dest='origin',
+                        type=six.text_type,
+                        default=None,
+                        help='origin')
+    parser.add_argument('-r',
+                        '--resource',
+                        dest='resource',
+                        type=six.text_type,
+                        default='/echo',
+                        help='resource path')
+    parser.add_argument(
+        '-m',
+        '--message',
+        dest='message',
+        type=six.text_type,
+        default=u'Hello,\u65e5\u672c',
+        help=('comma-separated messages to send. '
+              '%s will force close the connection from server.' %
+              _GOODBYE_MESSAGE))
+    parser.add_argument('-q',
+                        '--quiet',
+                        dest='verbose',
+                        action='store_false',
+                        default=True,
+                        help='suppress messages')
+    parser.add_argument('-t',
+                        '--tls',
+                        dest='use_tls',
+                        action='store_true',
+                        default=False,
+                        help='use TLS (wss://).')
+    parser.add_argument('-k',
+                        '--socket-timeout',
+                        '--socket_timeout',
+                        dest='socket_timeout',
+                        type=int,
+                        default=_TIMEOUT_SEC,
+                        help='Timeout(sec) for sockets')
+    parser.add_argument('--use-permessage-deflate',
+                        '--use_permessage_deflate',
+                        dest='use_permessage_deflate',
+                        action='store_true',
+                        default=False,
+                        help='Use the permessage-deflate extension.')
+    parser.add_argument('--log-level',
+                        '--log_level',
+                        type=six.text_type,
+                        dest='log_level',
+                        default='warn',
+                        choices=['debug', 'info', 'warn', 'error', 'critical'],
+                        help='Log level.')
+
+    options = parser.parse_args()
 
     logging.basicConfig(level=logging.getLevelName(options.log_level.upper()))
 
@@ -682,11 +684,6 @@ def main():
         else:
             options.server_port = common.DEFAULT_WEB_SOCKET_PORT
 
-    # optparse doesn't seem to handle non-ascii default values.
-    # Set default message here.
-    if not options.message:
-        options.message = u'Hello,\u65e5\u672c'  # "Japan" in Japanese
-
     EchoClient(options).run()
 
 

mod_pywebsocket/extensions.py

@@ -273,6 +273,7 @@ def set_client_max_window_bits(self, value):
 
         If this method has been called with True and an offer without the
         client_max_window_bits extension parameter is received,
+
         - (When processing the permessage-deflate extension) this processor
           declines the request.
         - (When processing the permessage-compress extension) this processor

mod_pywebsocket/http_header_util.py

@@ -120,7 +120,7 @@ def consume_lws(state):
 
 
 def consume_lwses(state):
-    """Consumes *LWS from the head."""
+    r"""Consumes \*LWS from the head."""
 
     while consume_lws(state):
         pass

mod_pywebsocket/request_handler.py

@@ -208,7 +208,7 @@ def parse_request(self):
             return False
 
         if self._options.use_basic_auth:
-            auth = self.headers.getheader('Authorization')
+            auth = self.headers.get('Authorization')
             if auth != self._options.basic_auth_credential:
                 self.send_response(401)
                 self.send_header('WWW-Authenticate',