From 26e4745c450cccae6ba2328719dfcc8dcb1e81ac Mon Sep 17 00:00:00 2001
From: Sven Slootweg <jamsoftgamedev@gmail.com>
Date: Fri, 8 Jun 2012 02:51:32 +0200
Subject: [PATCH] Moved around files

---
 __init__.py => resolv/__init__.py             | 0
 {resolvers => resolv/resolvers}/__init__.py   | 0
 {resolvers => resolv/resolvers}/dummy.py      | 0
 {resolvers => resolv/resolvers}/filebox.py    | 0
 {resolvers => resolv/resolvers}/onechannel.py | 0
 {resolvers => resolv/resolvers}/pastebin.py   | 0
 {resolvers => resolv/resolvers}/putlocker.py  | 0
 {resolvers => resolv/resolvers}/sockshare.py  | 0
 {resolvers => resolv/resolvers}/youtube.py    | 2 +-
 shared.py => resolv/shared.py                 | 0
 10 files changed, 1 insertion(+), 1 deletion(-)
 rename __init__.py => resolv/__init__.py (100%)
 rename {resolvers => resolv/resolvers}/__init__.py (100%)
 rename {resolvers => resolv/resolvers}/dummy.py (100%)
 rename {resolvers => resolv/resolvers}/filebox.py (100%)
 rename {resolvers => resolv/resolvers}/onechannel.py (100%)
 rename {resolvers => resolv/resolvers}/pastebin.py (100%)
 rename {resolvers => resolv/resolvers}/putlocker.py (100%)
 rename {resolvers => resolv/resolvers}/sockshare.py (100%)
 rename {resolvers => resolv/resolvers}/youtube.py (97%)
 rename shared.py => resolv/shared.py (100%)

diff --git a/__init__.py b/resolv/__init__.py
similarity index 100%
rename from __init__.py
rename to resolv/__init__.py
diff --git a/resolvers/__init__.py b/resolv/resolvers/__init__.py
similarity index 100%
rename from resolvers/__init__.py
rename to resolv/resolvers/__init__.py
diff --git a/resolvers/dummy.py b/resolv/resolvers/dummy.py
similarity index 100%
rename from resolvers/dummy.py
rename to resolv/resolvers/dummy.py
diff --git a/resolvers/filebox.py b/resolv/resolvers/filebox.py
similarity index 100%
rename from resolvers/filebox.py
rename to resolv/resolvers/filebox.py
diff --git a/resolvers/onechannel.py b/resolv/resolvers/onechannel.py
similarity index 100%
rename from resolvers/onechannel.py
rename to resolv/resolvers/onechannel.py
diff --git a/resolvers/pastebin.py b/resolv/resolvers/pastebin.py
similarity index 100%
rename from resolvers/pastebin.py
rename to resolv/resolvers/pastebin.py
diff --git a/resolvers/putlocker.py b/resolv/resolvers/putlocker.py
similarity index 100%
rename from resolvers/putlocker.py
rename to resolv/resolvers/putlocker.py
diff --git a/resolvers/sockshare.py b/resolv/resolvers/sockshare.py
similarity index 100%
rename from resolvers/sockshare.py
rename to resolv/resolvers/sockshare.py
diff --git a/resolvers/youtube.py b/resolv/resolvers/youtube.py
similarity index 97%
rename from resolvers/youtube.py
rename to resolv/resolvers/youtube.py
index 223f22d..fc190e2 100644
--- a/resolvers/youtube.py
+++ b/resolv/resolvers/youtube.py
@@ -69,7 +69,7 @@ def resolve(url):
 		stream_pool['video_%s_%s' % (video_quality, video_format)] = video_url
 	
 	try:
-		video_title = urllib.unquote(re.search('<meta property="og:title" content="([^"]*)">', contents).groups(1))
+		video_title = urllib.unquote(re.search('<meta property="og:title" content="([^"]*)">', contents).group(1))
 	except:
 		raise ResolverError("Could not find the video title.")
 	
diff --git a/shared.py b/resolv/shared.py
similarity index 100%
rename from shared.py
rename to resolv/shared.py