# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: nils@nilsdabrock.de-20110404165637-bsr126t1xh3medov # target_branch: http://bazaar.launchpad.net/~gwibber-\ # committers/gwibber/trunk/ # testament_sha1: 079e40cdcbc9251e58c9bdf3b279983ab97517c2 # timestamp: 2011-04-04 19:06:39 +0200 # base_revision_id: ken.vandine@canonical.com-20110403050040-\ # pyyvgnpqe3j6ostb # # Begin patch === modified file 'gwibber/microblog/util/__init__.py' --- gwibber/microblog/util/__init__.py 2010-11-17 02:20:57 +0000 +++ gwibber/microblog/util/__init__.py 2011-04-04 16:56:37 +0000 @@ -33,7 +33,7 @@ PARSE_LINK = re.compile(URL_FORMAT, re.U) PARSE_NICK = re.compile("\B@([A-Za-z0-9_]+|@[A-Za-z0-9_]$)") -PARSE_HASH = re.compile("\B#([A-Za-z0-9_\-]+|@[A-Za-z0-9_\-]$)") +PARSE_HASH = re.compile("\B#(\S+|@[\S]$)") PARSE_URLS = re.compile(r"<[^<]*?/?>") def strip_urls(text): # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWf40DzkAAXDfgAAQXGv/93ZD WA6////0UAN6VaVnrosRwlEmmgTEYmRoFHg1T0GptNBoxR6nqCSoaZMmSp/pqp+TEptNRo2oBpia aNGgAkiCAp5NR5T0QARoGAAJgBzAJpgEyGAAJgmAAACSKMpppqHqfpQfqjajQA0NPUNAABdpKe+/ 1M5wHlCFAGOTu7Pn0/+d3PmwzePavSM7WetmeZ83SEPs3tJ7tmXqzaoXpoaprNdkQ9nYJuzcZ9Dx PZ+NvDkZaTmEgmS2oStkENaRKOVeYRZUT5SIKMTInNEtwJIQgcatP8JQNHnGlUqSBxSVRElR5b+l SVhUq1MjYPrD4yiLbEO3wIGE1YDG4Qfa/qEb901XVXsNSaTpeiY5ZidYROhsMHjk1rxwMCwx/vAL UpsIk5iUubOshWGsZsRPBu+eDSK2zhmHwiLpwfcb5sXQJ0QTkwpuXbY+hqRi+DUJVkNMKxUPcZG2 FenKdKrLpSVROUZCoSdr6ByNWssySv9FULVYKrWiWb05G1u00xWNeDiBGhwa30uDLJbTcOhAvkqr hxdcWMfhbU+jWziYjx0TlXUVFpnOu5rJFjRuvebocnKCZ2iUA6BfMymi0pj0sMfB/uob0T79OrZV FVfqZ7zPLwHcoejGfV/26xxpLWjqVmwtcjwU+TS5o8GLb32bOmZE3xXvQJePXwDC6EYhAJVolpbx XFhHDOa87rBzQ8uwkp5HOdwMAmm4Mz8BK94sJA2B+YJ35ztlhsz86FRG8QkWyiBt50b01dhWxOSx pNNiLSrrnxLw7sRSp5hvSd1WQvVXaZJyZ3ZGw++7Y7AF/41KyaEKy6HNGJg6OnWmaWjdO5c3VhUE Q5FSeqqXRitpIQcjJeQu4oN0J/de2xTaXO/xsQrRX2GfuIuEFifekSLHUa8lk18GLRwRYMpjv012 qd4xK4yJhAKSXR1b9LdA2CKpBnL5LhtuEbnxDhiDYAwVhW4XnAyhbVQko5wvUdYVkTalijAeAxYD LbhSDAwUMwX6TAaqfaliDHjDqWRFLJlmtQTFOkOZwpMwRXCOuNXb4tnKW3MyoKou5oymom9S2TVn zizV4SlZah/OwZxcnAUsg+1tQa8d1SV0nOYlJYX26hXcs8BPJJ4cKny8ugrIqzkfHEJlnkyKPwjI eF4WVKOOOm9xa9ENQrev0oGYUr05CYr9SYoTqy0l9fYu5IpwoSH8aB5y