summaryrefslogtreecommitdiff
path: root/setuptools/command
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2016-07-20 11:53:29 -0400
committerGitHub <noreply@github.com>2016-07-20 11:53:29 -0400
commitd5f38148ef994724811fea55d4c6dc392f97b429 (patch)
tree75133a283a02cba07c37ccb76a7134acd744a591 /setuptools/command
parent39374cb5747b8cc18240f474d10d17913f203b67 (diff)
parent01de794bc829cc9eb0c1512b3570acec970e1acf (diff)
downloadpython-setuptools-git-d5f38148ef994724811fea55d4c6dc392f97b429.tar.gz
Merge pull request #655 from stepshal/imorts_in_same_block
Put imports in same block alphabeticaly.
Diffstat (limited to 'setuptools/command')
-rw-r--r--setuptools/command/bdist_egg.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/setuptools/command/bdist_egg.py b/setuptools/command/bdist_egg.py
index 9cebd7fa..c40022a1 100644
--- a/setuptools/command/bdist_egg.py
+++ b/setuptools/command/bdist_egg.py
@@ -8,8 +8,8 @@ from distutils import log
from types import CodeType
import sys
import os
-import marshal
import textwrap
+import marshal
from setuptools.extern import six