From 5f6d6971c778d6c3405f06bc4b0224ea1b3d73d4 Mon Sep 17 00:00:00 2001
From: Stefan Koegl <stefan@skoegl.net>
Date: Tue, 9 Feb 2010 15:37:24 +0100
Subject: [PATCH] fix error with dashes in device uids (bug 858)

---
 mygpo/urls.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mygpo/urls.py b/mygpo/urls.py
index ed79fb5e..eeae6d15 100644
--- a/mygpo/urls.py
+++ b/mygpo/urls.py
@@ -71,15 +71,15 @@ urlpatterns = patterns('',
     (r'^getlist$', 'mygpo.api.legacy.getlist'),
 
     #Simple API
-    (r'^subscriptions/(?P<username>\w+)/(?P<device_uid>\w+).(?P<format>\w+)', 'mygpo.api.simple.subscriptions'),
+    (r'^subscriptions/(?P<username>\w+)/(?P<device_uid>[\w-]+).(?P<format>\w+)', 'mygpo.api.simple.subscriptions'),
     (r'^toplist/(?P<count>\d+).(?P<format>\w+)', 'mygpo.api.simple.toplist'),
     (r'^search.(?P<format>\w+)', 'mygpo.api.simple.search'),
     (r'^suggestions/(?P<count>\d+).(?P<format>\w+)', 'mygpo.api.simple.suggestions'),
 
     #Advanced API
-    (r'^api/1/subscriptions/(?P<username>\w+)/(?P<device_uid>\w+).json', 'mygpo.api.advanced.subscriptions'),
+    (r'^api/1/subscriptions/(?P<username>\w+)/(?P<device_uid>[\w-]+).json', 'mygpo.api.advanced.subscriptions'),
     (r'^api/1/episodes/(?P<username>\w+).json', 'mygpo.api.advanced.episodes'),
-    (r'^api/1/devices/(?P<username>\w+)/(?P<device_uid>\w+).json', 'mygpo.api.advanced.device'),
+    (r'^api/1/devices/(?P<username>\w+)/(?P<device_uid>[\w-]+).json', 'mygpo.api.advanced.device'),
     (r'^api/1/devices/(?P<username>\w+).json', 'mygpo.api.advanced.devices'),
 
     #Subscribe with my.gpodder.org
-- 
2.11.4.GIT