Merge pull request #785 from oberstet/fab2

Fab2
crossbario · Mar 10, 2017 · 0108058 · 0108058
2 parents 3dc5335 + 7d84180
commit 0108058
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -19,7 +19,9 @@ install:
 # upload to our internal deployment system
 upload: clean
 	python setup.py bdist_wheel
-	aws s3 cp dist/*.whl s3://fabric-deploy/
+	aws s3 cp --acl public-read \
+		dist/autobahn-*.whl \
+		s3://fabric-deploy/autobahn/
 
 # cleanup everything
 clean:

diff --git a/autobahn/asyncio/wamp.py b/autobahn/asyncio/wamp.py
@@ -102,7 +102,7 @@ def __init__(self, url, realm, extra=None, serializers=None, ssl=None):
         :type ssl: :class:`ssl.SSLContext` or bool
         """
         assert(type(url) == six.text_type)
-        assert(type(realm) == six.text_type)
+        assert(realm is None or type(realm) == six.text_type)
         assert(extra is None or type(extra) == dict)
         self.url = url
         self.realm = realm

diff --git a/docs/conf.py b/docs/conf.py
@@ -61,7 +61,7 @@ def use_aio():
 import sphinx.environment
 from docutils.utils import get_source_line
 
-def _warn_node(self, msg, node):
+def _warn_node(self, msg, node, **kwargs):
     if not msg.startswith('nonlocal image URI found:'):
         self._warnfunc(msg, '%s:%s' % get_source_line(node))