From 4e38899e9754c0bd0655732a02388559046b004e Mon Sep 17 00:00:00 2001
From: Filippo Valsorda <filippo.valsorda@gmail.com>
Date: Thu, 27 Dec 2012 01:45:40 +0100
Subject: print some version and environment info on --verbose (+ py3 fixes)

---
 youtube_dl/__init__.py | 15 +++++++++++++--
 youtube_dl/version.py  |  1 +
 2 files changed, 14 insertions(+), 2 deletions(-)

(limited to 'youtube_dl')

diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py
index cc2f555b9..092ff268c 100644
--- a/youtube_dl/__init__.py
+++ b/youtube_dl/__init__.py
@@ -34,9 +34,10 @@ import socket
 import subprocess
 import sys
 import warnings
+import platform
 
 from .utils import *
-from .version import __version__
+from .version import __version__, __version_codename__
 from .FileDownloader import *
 from .InfoExtractors import *
 from .PostProcessor import *
@@ -81,7 +82,7 @@ def update_self(to_screen, verbose, filename):
         return
     signature = versions_info['signature']
     del versions_info['signature']
-    if not rsa_verify(json.dumps(versions_info, sort_keys=True), signature, UPDATES_RSA_KEY):
+    if not rsa_verify(json.dumps(versions_info, sort_keys=True).encode('utf-8'), signature, UPDATES_RSA_KEY):
         to_screen(u'ERROR: the versions file signature is invalid. Aborting.')
         return
 
@@ -602,6 +603,16 @@ def _real_main():
         })
 
     if opts.verbose:
+        fd.to_screen(u'[debug] youtube-dl version %s - %s' %(__version__, __version_codename__))
+        try:
+            sp = subprocess.Popen(['git', 'rev-parse', '--short', 'HEAD'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            out, err = sp.communicate()
+            out = out.decode().strip()
+            if re.match('[0-9a-f]+', out):
+                fd.to_screen(u'[debug] Git HEAD: ' + out)
+        except:
+            pass
+        fd.to_screen(u'[debug] Python version %s - %s' %(platform.python_version(), platform.platform()))
         fd.to_screen(u'[debug] Proxy map: ' + str(proxy_handler.proxies))
 
     for extractor in extractors:
diff --git a/youtube_dl/version.py b/youtube_dl/version.py
index d5986f5e6..461a6785d 100644
--- a/youtube_dl/version.py
+++ b/youtube_dl/version.py
@@ -1,2 +1,3 @@
 
 __version__ = '2012.12.11'
+__version_codename__ = ''
-- 
cgit v1.2.3