Merge lp:~seb128/ubuntuone-client-data/import-pep8-valid into lp:ubuntuone-client-data

[Sebastien Bacher]

list imports on top to avoid pep8 E402 errors

list imports on top to avoid pep8 E402 errors

see https://launchpadlibrarian.net/219674307/buildlog_ubuntu-wily-amd64.ubuntuone-client-data_13.05-0ubuntu1_BUILDING.txt.gz

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:13
http://jenkins.qa.ubuntu.com/job/ubuntuone-client-data-ci/4/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntuone-client-data-wily-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntuone-client-data-wily-armhf-ci/2
        deb: http://jenkins.qa.ubuntu.com/job/ubuntuone-client-data-wily-armhf-ci/2/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntuone-client-data-wily-i386-ci/2

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntuone-client-data-ci/4/rebuild

review: Approve (continuous-integration)

[dobey (dobey)]

review: Approve

[Łukasz Zemczak (sil2100)]

Exactly this is what I did as a distro-patch for bug LP: #1503291. +1!

review: Approve

=== modified file 'setup.py'
--- setup.py	2014-01-02 21:17:33 +0000
+++ setup.py	2015-10-05 13:45:58 +0000
@@ -22,6 +22,9 @@
 import subprocess
 import sys
 
+from distutils.command import build
+from distutils.spawn import find_executable
+
 real_setup = None
 real_clean = None
 if sys.platform == 'linux2':
@@ -42,9 +45,6 @@
     real_setup = setup
     real_clean = clean
 
-from distutils.command import build
-from distutils.spawn import find_executable
-
 POT_FILE = 'po/ubuntuone-client-data.pot'
 
 CLEANFILES = [POT_FILE, 'MANIFEST']