summary refs log tree commit diff
diff options
context:
space:
mode:
authorWitold Baryluk <baryluk@smp.if.uj.edu.pl>2010-07-02 02:00:14 +0200
committerRicardo Garcia <sarbalap+freshmeat@gmail.com>2010-10-31 11:28:17 +0100
commit08cf5cb80b1db00fe8a08da944e6915a9999b4ae (patch)
tree986b890e7a7908bb49e949094d746f941ec8b7af
parent4135fa4585a69b88952a235c27385ee775878182 (diff)
downloadyoutube-dl-08cf5cb80b1db00fe8a08da944e6915a9999b4ae.tar.gz
youtube-dl-08cf5cb80b1db00fe8a08da944e6915a9999b4ae.tar.xz
youtube-dl-08cf5cb80b1db00fe8a08da944e6915a9999b4ae.zip
Remove dead disclaimer/confirmation code.
I do knot know how to perform age confirmation, so just
removeing it for the time we will know how to do this.
-rwxr-xr-xyoutube-dl24
1 files changed, 0 insertions, 24 deletions
diff --git a/youtube-dl b/youtube-dl
index b94fe4ce2..dbe348f1f 100755
--- a/youtube-dl
+++ b/youtube-dl
@@ -1089,8 +1089,6 @@ class DailymotionIE(InfoExtractor):
 	"""Information Extractor for Dailymotion"""
 
 	_VALID_URL = r'(?i)(?:https?://)?(?:www\.)?dailymotion\.[a-z]{2,3}/video/([^_/]+)_([^/]+)'
-	_DISCLAIMER = ''
-	_FILTER_POST = ''
 
 	def __init__(self, downloader=None):
 		InfoExtractor.__init__(self, downloader)
@@ -1118,28 +1116,6 @@ class DailymotionIE(InfoExtractor):
 	def _real_initialize(self):
 		return
 
-		# Retrieve disclaimer
-		request = urllib2.Request(self._DISCLAIMER, None, std_headers)
-		try:
-			self.report_disclaimer()
-			disclaimer = urllib2.urlopen(request).read()
-		except (urllib2.URLError, httplib.HTTPException, socket.error), err:
-			self._downloader.trouble(u'ERROR: unable to retrieve disclaimer: %s' % str(err))
-			return
-
-		# Confirm age
-		disclaimer_form = {
-			'filters': '0',
-			'submit': "Continue - I'm over 18",
-			}
-		request = urllib2.Request(self._FILTER_POST, urllib.urlencode(disclaimer_form), std_headers)
-		try:
-			self.report_age_confirmation()
-			disclaimer = urllib2.urlopen(request).read()
-		except (urllib2.URLError, httplib.HTTPException, socket.error), err:
-			self._downloader.trouble(u'ERROR: unable to confirm age: %s' % str(err))
-			return
-	
 	def _real_extract(self, url):
 		# Extract id and simplified title from URL
 		mobj = re.match(self._VALID_URL, url)