From 4a2f0d11b82f729f9b633836faacaff522f21b6d Mon Sep 17 00:00:00 2001
From: Thomas Scholtes <thomas-scholtes@gmx.de>
Date: Wed, 9 Apr 2014 18:22:02 +0200
Subject: [PATCH] Flake fixes

---
 docs/conf.py |  14 +++---
 setup.py     | 131 ++++++++++++++++++++++++++-------------------------
 2 files changed, 73 insertions(+), 72 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index e7c85be02..9f648aee0 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -1,10 +1,9 @@
 AUTHOR = u'Adrian Sampson'
 
-# -- General configuration -----------------------------------------------------
+# General configuration
 
 extensions = ['sphinx.ext.autodoc']
 
-#templates_path = ['_templates']
 exclude_patterns = ['_build']
 source_suffix = '.rst'
 master_doc = 'index'
@@ -17,20 +16,19 @@ release = '1.3.5'
 
 pygments_style = 'sphinx'
 
-# -- Options for HTML output ---------------------------------------------------
+# Options for HTML output
 
 html_theme = 'default'
-#html_static_path = ['_static']
 htmlhelp_basename = 'beetsdoc'
 
-# -- Options for LaTeX output --------------------------------------------------
+# Options for LaTeX output
 
 latex_documents = [
-  ('index', 'beets.tex', u'beets Documentation',
-   AUTHOR, 'manual'),
+    ('index', 'beets.tex', u'beets Documentation',
+     AUTHOR, 'manual'),
 ]
 
-# -- Options for manual page output --------------------------------------------
+# Options for manual page output
 
 man_pages = [
     ('reference/cli', 'beet', u'music tagger and library organizer',
diff --git a/setup.py b/setup.py
index 1abac61ee..04f3959f7 100755
--- a/setup.py
+++ b/setup.py
@@ -20,10 +20,12 @@ import subprocess
 import shutil
 from setuptools import setup
 
+
 def _read(fn):
     path = os.path.join(os.path.dirname(__file__), fn)
     return open(path).read()
 
+
 # Build manpages if we're making a source distribution tarball.
 if 'sdist' in sys.argv:
     # Go into the docs directory and build the manpage.
@@ -41,73 +43,74 @@ if 'sdist' in sys.argv:
         shutil.rmtree(mandir)
     shutil.copytree(os.path.join(docdir, '_build', 'man'), mandir)
 
-setup(name='beets',
-      version='1.3.5',
-      description='music tagger and library organizer',
-      author='Adrian Sampson',
-      author_email='adrian@radbox.org',
-      url='http://beets.radbox.org/',
-      license='MIT',
-      platforms='ALL',
-      long_description=_read('README.rst'),
-      test_suite='test.testall.suite',
-      include_package_data=True, # Install plugin resources.
+setup(
+    name='beets',
+    version='1.3.5',
+    description='music tagger and library organizer',
+    author='Adrian Sampson',
+    author_email='adrian@radbox.org',
+    url='http://beets.radbox.org/',
+    license='MIT',
+    platforms='ALL',
+    long_description=_read('README.rst'),
+    test_suite='test.testall.suite',
+    include_package_data=True,  # Install plugin resources.
 
-      packages=[
-          'beets',
-          'beets.ui',
-          'beets.autotag',
-          'beets.util',
-          'beets.dbcore',
-          'beetsplug',
-          'beetsplug.bpd',
-          'beetsplug.web',
-          'beetsplug.lastgenre',
-      ],
-      entry_points={
-          'console_scripts': [
-              'beet = beets.ui:main',
-          ],
-      },
+    packages=[
+        'beets',
+        'beets.ui',
+        'beets.autotag',
+        'beets.util',
+        'beets.dbcore',
+        'beetsplug',
+        'beetsplug.bpd',
+        'beetsplug.web',
+        'beetsplug.lastgenre',
+    ],
+    entry_points={
+        'console_scripts': [
+            'beet = beets.ui:main',
+        ],
+    },
 
-      install_requires=[
-          'enum34',
-          'mutagen>=1.22',
-          'munkres',
-          'unidecode',
-          'musicbrainzngs>=0.4',
-          'pyyaml',
-      ]
-      + (['colorama'] if (sys.platform == 'win32') else [])
-      + (['ordereddict'] if sys.version_info < (2, 7, 0) else []),
+    install_requires=[
+        'enum34',
+        'mutagen>=1.22',
+        'munkres',
+        'unidecode',
+        'musicbrainzngs>=0.4',
+        'pyyaml',
+    ]
+    + (['colorama'] if (sys.platform == 'win32') else [])
+    + (['ordereddict'] if sys.version_info < (2, 7, 0) else []),
 
-      tests_require=[
-          'responses',
-      ],
+    tests_require=[
+        'responses',
+    ],
 
-      # Plugin (optional) dependencies:
-      extras_require={
-          'beatport': ['requests'],
-          'fetchart': ['requests'],
-          'chroma': ['pyacoustid'],
-          'discogs': ['discogs-client'],
-          'echonest_tempo': ['pyechonest'],
-          'lastgenre': ['pylast'],
-          'web': ['flask'],
-      },
-      # Non-Python/non-PyPI plugin dependencies:
-      # replaygain: mp3gain || aacgain
-      # convert: ffmpeg
-      # bpd: pygst
+    # Plugin (optional) dependencies:
+    extras_require={
+        'beatport': ['requests'],
+        'fetchart': ['requests'],
+        'chroma': ['pyacoustid'],
+        'discogs': ['discogs-client'],
+        'echonest_tempo': ['pyechonest'],
+        'lastgenre': ['pylast'],
+        'web': ['flask'],
+    },
+    # Non-Python/non-PyPI plugin dependencies:
+    # replaygain: mp3gain || aacgain
+    # convert: ffmpeg
+    # bpd: pygst
 
-      classifiers=[
-          'Topic :: Multimedia :: Sound/Audio',
-          'Topic :: Multimedia :: Sound/Audio :: Players :: MP3',
-          'License :: OSI Approved :: MIT License',
-          'Environment :: Console',
-          'Environment :: Web Environment',
-          'Programming Language :: Python :: 2',
-          'Programming Language :: Python :: 2.6',
-          'Programming Language :: Python :: 2.7',
-      ],
+    classifiers=[
+        'Topic :: Multimedia :: Sound/Audio',
+        'Topic :: Multimedia :: Sound/Audio :: Players :: MP3',
+        'License :: OSI Approved :: MIT License',
+        'Environment :: Console',
+        'Environment :: Web Environment',
+        'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 2.6',
+        'Programming Language :: Python :: 2.7',
+    ],
 )