From 5d1e01762bcb7ce423eafb38552dce9639f1d5d3 Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Thu, 3 Jan 2013 13:14:21 +0100
Subject: [PATCH] scanner: Fix optparse on early 2.6 (#302)

---
 mopidy/scanner.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/mopidy/scanner.py b/mopidy/scanner.py
index aba2491c..9f8c12f7 100644
--- a/mopidy/scanner.py
+++ b/mopidy/scanner.py
@@ -79,12 +79,15 @@ def main():
 def parse_options():
     parser = optparse.OptionParser(
         version='Mopidy %s' % versioning.get_version())
+    # NOTE Python 2.6: To support Python versions < 2.6.2rc1 we must use
+    # bytestrings for the first argument to ``add_option``
+    # See https://github.com/mopidy/mopidy/issues/302 for details
     parser.add_option(
-        '-q', '--quiet',
+        b'-q', '--quiet',
         action='store_const', const=0, dest='verbosity_level',
         help='less output (warning level)')
     parser.add_option(
-        '-v', '--verbose',
+        b'-v', '--verbose',
         action='count', default=1, dest='verbosity_level',
         help='more output (debug level)')
     return parser.parse_args(args=mopidy_args)[0]