From 73c4a43c07fb4020f6a218627885917954bd6910 Mon Sep 17 00:00:00 2001
From: Romain Bignon <romain@peerfuse.org>
Date: Sun, 13 Mar 2011 15:01:04 +0100
Subject: [PATCH] usernames can have a '-' in them

---
 weboob/backends/dlfp/browser.py | 2 +-
 weboob/backends/dlfp/tools.py   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/weboob/backends/dlfp/browser.py b/weboob/backends/dlfp/browser.py
index a0676872..8f3e581b 100644
--- a/weboob/backends/dlfp/browser.py
+++ b/weboob/backends/dlfp/browser.py
@@ -33,7 +33,7 @@ class DLFP(BaseBrowser):
     PAGES = {'https://linuxfr.org/?': IndexPage,
              'https://linuxfr.org/login.html': LoginPage,
              'https://linuxfr.org/news/[^\.]+': ContentPage,
-             'https://linuxfr.org/users/[\w_]+/journaux/[^\.]+': ContentPage,
+             'https://linuxfr.org/users/[\w\-_]+/journaux/[^\.]+': ContentPage,
              'https://linuxfr.org/nodes/(\d+)/comments/(\d+)$': CommentPage,
              'https://linuxfr.org/nodes/(\d+)/comments/nouveau': NewCommentPage,
              'https://linuxfr.org/nodes/(\d+)/comments$': NodePage,
diff --git a/weboob/backends/dlfp/tools.py b/weboob/backends/dlfp/tools.py
index 0d4d02d2..98f55706 100644
--- a/weboob/backends/dlfp/tools.py
+++ b/weboob/backends/dlfp/tools.py
@@ -19,8 +19,8 @@
 import re
 
 RSSID_RE = re.compile('tag:.*:(\w)\w+/(\d+)')
-ID2URL_RE = re.compile('^(\w)([\w_]*)\.([^\.]+)$')
-URL2ID_DIARY_RE = re.compile('.*/users/([\w_]+)/journaux/([^\.]+)')
+ID2URL_RE = re.compile('^(\w)([\w\-_]*)\.([^\.]+)$')
+URL2ID_DIARY_RE = re.compile('.*/users/([\w\-_]+)/journaux/([^\.]+)')
 URL2ID_NEWSPAPER_RE = re.compile('.*/news/(.+)')
 
 def rssid(entry):