summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCalum Lind <calumlind+deluge@gmail.com>2015-10-21 00:34:49 +0100
committerCalum Lind <calumlind+deluge@gmail.com>2015-10-21 01:17:08 +0100
commitebc00f3d7c48ced6b0b230125c72fa5fabf57724 (patch)
tree44294b1849299b2f11439078875be375fd507eef
parent32bc20d8ce2b564a460cdc82ba0b9ebe8e05ed6b (diff)
downloaddeluge-ebc00f3d7c48ced6b0b230125c72fa5fabf57724.tar.gz
deluge-ebc00f3d7c48ced6b0b230125c72fa5fabf57724.tar.bz2
deluge-ebc00f3d7c48ced6b0b230125c72fa5fabf57724.zip
Fix config for isort 4.2
-rw-r--r--deluge/ui/web/auth.py3
-rw-r--r--setup.cfg5
-rw-r--r--tox.ini2
3 files changed, 5 insertions, 5 deletions
diff --git a/deluge/ui/web/auth.py b/deluge/ui/web/auth.py
index 93cf91b8e..55325542d 100644
--- a/deluge/ui/web/auth.py
+++ b/deluge/ui/web/auth.py
@@ -15,9 +15,10 @@ from datetime import datetime, timedelta
from email.utils import formatdate
from functools import reduce
+from twisted.internet.task import LoopingCall
+
from deluge import component
from deluge.common import utf8_encoded
-from twisted.internet.task import LoopingCall
log = logging.getLogger(__name__)
diff --git a/setup.cfg b/setup.cfg
index 030ef6913..ae1a1b9fb 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -15,10 +15,9 @@ includes = glib, gio, cairo, pango, pangocairo, atk, gobject, gtk.keysyms,
frameworks = CoreFoundation, Foundation, AppKit
[isort]
-default_section=THIRDPARTY
known_standard_library=unicodedata
-known_third_party=pygtk,gtk,gobject,gtk.gdk,pango,cairo,pangocairo,twisted,pytest,OpenSSL,pkg_resources,chardet
-known_first_party=msgfmt,
+known_third_party=pygtk,gtk,gobject,gtk.gdk,pango,cairo,pangocairo,twisted,pytest,OpenSSL,pkg_resources,chardet,bbfreeze,win32verstamp
+known_first_party=msgfmt
order_by_type=true
line_length=120
not_skip=__init__.py
diff --git a/tox.ini b/tox.ini
index caf0de4ee..91b976e64 100644
--- a/tox.ini
+++ b/tox.ini
@@ -81,7 +81,7 @@ commands = {[testenv:pydef]commands}
[testenv:isort]
deps =
{[testenv]deps}
- isort>=4.0.0
+ isort>=4.2.0
whitelist_externals =
{[testenv]whitelist_externals}
isort