Author: rhs
Date: Tue Nov 10 20:16:27 2009
New Revision: 834647
URL: http://svn.apache.org/viewvc?rev=834647&view=rev
Log:
permit hash and star as part of the address
Added:
qpid/trunk/qpid/python/qpid/tests/address.py
Modified:
qpid/trunk/qpid/python/qpid/address.py
qpid/trunk/qpid/python/qpid/tests/__init__.py
Modified: qpid/trunk/qpid/python/qpid/address.py
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/python/qpid/address.py?rev=834647&r1=834646&r2=834647&view=diff
==============================================================================
--- qpid/trunk/qpid/python/qpid/address.py (original)
+++ qpid/trunk/qpid/python/qpid/address.py Tue Nov 10 20:16:27 2009
@@ -36,7 +36,7 @@
COLON = Type("COLON", r":")
COMMA = Type("COMMA", r",")
SLASH = Type("SLASH", r"/")
-ID = Type("ID", r'[a-zA-Z_][a-zA-Z0-9_.-]*')
+ID = Type("ID", r'[a-zA-Z_][a-zA-Z0-9_.#*-]*')
NUMBER = Type("NUMBER", r'[+-]?[0-9]*\.?[0-9]+')
STRING = Type("STRING", r""""(?:[^\\"]|\\.)*"|'(?:[^\\']|\\.)*'""")
WSPACE = Type("WSPACE", r"[ \n\r\t]+")
Modified: qpid/trunk/qpid/python/qpid/tests/__init__.py
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/python/qpid/tests/__init__.py?rev=834647&r1=834646&r2=834647&view=diff
==============================================================================
--- qpid/trunk/qpid/python/qpid/tests/__init__.py (original)
+++ qpid/trunk/qpid/python/qpid/tests/__init__.py Tue Nov 10 20:16:27 2009
@@ -25,4 +25,4 @@
def configure(self, config):
self.config = config
-import messaging, framing
+import address, framing, messaging
Added: qpid/trunk/qpid/python/qpid/tests/address.py
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/python/qpid/tests/address.py?rev=834647&view=auto
==============================================================================
--- qpid/trunk/qpid/python/qpid/tests/address.py (added)
+++ qpid/trunk/qpid/python/qpid/tests/address.py Tue Nov 10 20:16:27 2009
@@ -0,0 +1,35 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+from qpid.tests import Test
+from qpid.address import parse
+
+class AddressTests(Test):
+
+ def testHash(self):
+ name, subject, options = parse("foo/bar.#")
+ assert name == "foo", name
+ assert subject == "bar.#", bar
+ assert options == None
+
+ def testStar(self):
+ name, subject, options = parse("foo/bar.*")
+ assert name == "foo", name
+ assert subject == "bar.*", bar
+ assert options == None
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
