summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimothy Crosley <timothy.crosley@gmail.com>2015-02-05 23:44:33 -0500
committerTimothy Crosley <timothy.crosley@gmail.com>2015-02-05 23:44:33 -0500
commit8daf74a4a9e066ea4f58db61805824884160ce5b (patch)
tree7cf54d68e0604ea682088a4256b2a6c0383c85ad
parentb5ca0f6fba29c347bcb6de149d50f6ab947f4128 (diff)
parentdb10e70600a90c2f28c6e251aec35d2cbc641c8b (diff)
downloadisort-8daf74a4a9e066ea4f58db61805824884160ce5b.tar.gz
Merge tag '3.9.6' into develop
3.9.6
-rw-r--r--isort/__init__.py2
-rw-r--r--isort/isort.py2
-rwxr-xr-xsetup.py4
3 files changed, 4 insertions, 4 deletions
diff --git a/isort/__init__.py b/isort/__init__.py
index 585c81a0..4a445fa7 100644
--- a/isort/__init__.py
+++ b/isort/__init__.py
@@ -25,4 +25,4 @@ from __future__ import absolute_import, division, print_function, unicode_litera
from . import settings
from .isort import SECTION_NAMES, SECTIONS, SortImports
-__version__ = "3.9.5"
+__version__ = "3.9.6"
diff --git a/isort/isort.py b/isort/isort.py
index 34ae27d0..8ec00dd8 100644
--- a/isort/isort.py
+++ b/isort/isort.py
@@ -641,7 +641,7 @@ class SortImports(object):
self.import_index = self.index - 1
continue
- if "isort:" + "imports-" in line:
+ if "isort:" + "imports-" in line and line.startswith("#"):
section = line.split("isort:" + "imports-")[-1].split()[0]
self.place_imports[section.upper()] = []
self.import_placements[line] = section.upper()
diff --git a/setup.py b/setup.py
index ffc57d56..124bea32 100755
--- a/setup.py
+++ b/setup.py
@@ -42,13 +42,13 @@ except (IOError, ImportError, OSError, RuntimeError):
readme = ''
setup(name='isort',
- version='3.9.5',
+ version='3.9.6',
description='A Python utility / library to sort Python imports.',
long_description=readme,
author='Timothy Crosley',
author_email='timothy.crosley@gmail.com',
url='https://github.com/timothycrosley/isort',
- download_url='https://github.com/timothycrosley/isort/archive/3.9.5.tar.gz',
+ download_url='https://github.com/timothycrosley/isort/archive/3.9.6.tar.gz',
license="MIT",
entry_points={
'console_scripts': [