Merge branch 'master' of github.com:dae/anki

aqt/__init__.py

@@ -163,7 +163,7 @@ class AnkiApp(QApplication):
 
 def parseArgs(argv):
     "Returns (opts, args)."
-    parser = optparse.OptionParser()
+    parser = optparse.OptionParser(version="%prog " + appVersion)
     parser.usage = "%prog [OPTIONS] [file to import]"
     parser.add_option("-b", "--base", help="path to base folder")
     parser.add_option("-p", "--profile", help="profile name to load")
@@ -174,6 +174,11 @@ def run():
     global mw
     from anki.utils import  isMac
 
+    # parse args
+    opts, args = parseArgs(sys.argv)
+    opts.base = unicode(opts.base or "", sys.getfilesystemencoding())
+    opts.profile = unicode(opts.profile or "", sys.getfilesystemencoding())
+
     # on osx we'll need to add the qt plugins to the search path
     if isMac and getattr(sys, 'frozen', None):
         rd = os.path.abspath(moduleDir + "/../../..")
@@ -203,11 +208,6 @@ environment points to a valid, writable folder.""")
           "upgrade to a newer Qt, you may experience issues such as images "
           "failing to show up during review.")
 
-    # parse args
-    opts, args = parseArgs(sys.argv)
-    opts.base = unicode(opts.base or "", sys.getfilesystemencoding())
-    opts.profile = unicode(opts.profile or "", sys.getfilesystemencoding())
-
     # profile manager
     from aqt.profiles import ProfileManager
     pm = ProfileManager(opts.base, opts.profile)