X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Futils.py;h=528d87bb9d9d1bc542ff6310d74815cc2e801113;hb=732d116aa7bed0940bec29af67dd271e47932818;hp=9595bcf9f120ea4d24133e3f7399e637d14ac035;hpb=fb27d0ce5e91216296e3406d461fe5b7af78c477;p=youtube-dl

diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py
index 9595bcf9f..528d87bb9 100644
--- a/youtube_dl/utils.py
+++ b/youtube_dl/utils.py
@@ -86,6 +86,11 @@ std_headers = {
 }
 
 
+USER_AGENTS = {
+    'Safari': 'Mozilla/5.0 (X11; Linux x86_64; rv:10.0) AppleWebKit/533.20.25 (KHTML, like Gecko) Version/5.0.4 Safari/533.20.27',
+}
+
+
 NO_DEFAULT = object()
 
 ENGLISH_MONTH_NAMES = [
@@ -1695,6 +1700,16 @@ def base_url(url):
     return re.match(r'https?://[^?#&]+/', url).group()
 
 
+def urljoin(base, path):
+    if not isinstance(path, compat_str) or not path:
+        return None
+    if re.match(r'^(?:https?:)?//', path):
+        return path
+    if not isinstance(base, compat_str) or not re.match(r'^(?:https?:)?//', base):
+        return None
+    return compat_urlparse.urljoin(base, path)
+
+
 class HEADRequest(compat_urllib_request.Request):
     def get_method(self):
         return 'HEAD'