Commit 81ca4fea authored by Jason R. Coombs's avatar Jason R. Coombs

Move imports to top

parent 2a379eac
...@@ -12,11 +12,15 @@ import re ...@@ -12,11 +12,15 @@ import re
import sys import sys
import io import io
import warnings import warnings
import time
from setuptools.compat import basestring, PY3, StringIO
from setuptools import Command from setuptools import Command
from setuptools.command.sdist import sdist from setuptools.command.sdist import sdist
from setuptools.compat import basestring, PY3, StringIO
from setuptools.command.sdist import walk_revctrl from setuptools.command.sdist import walk_revctrl
from setuptools.command.setopt import edit_config
from setuptools.command import bdist_egg
from pkg_resources import ( from pkg_resources import (
parse_requirements, safe_name, parse_version, parse_requirements, safe_name, parse_version,
safe_version, yield_lines, EntryPoint, iter_entry_points, to_filename) safe_version, yield_lines, EntryPoint, iter_entry_points, to_filename)
...@@ -61,8 +65,6 @@ class egg_info(Command): ...@@ -61,8 +65,6 @@ class egg_info(Command):
self.vtags = None self.vtags = None
def save_version_info(self, filename): def save_version_info(self, filename):
from setuptools.command.setopt import edit_config
values = dict( values = dict(
egg_info=dict( egg_info=dict(
tag_svn_revision=0, tag_svn_revision=0,
...@@ -189,8 +191,6 @@ class egg_info(Command): ...@@ -189,8 +191,6 @@ class egg_info(Command):
if self.tag_svn_revision: if self.tag_svn_revision:
version += '-r%s' % self.get_svn_revision() version += '-r%s' % self.get_svn_revision()
if self.tag_date: if self.tag_date:
import time
version += time.strftime("-%Y%m%d") version += time.strftime("-%Y%m%d")
return version return version
...@@ -391,7 +391,6 @@ def write_pkg_info(cmd, basename, filename): ...@@ -391,7 +391,6 @@ def write_pkg_info(cmd, basename, filename):
metadata.name, metadata.version = oldname, oldver metadata.name, metadata.version = oldname, oldver
safe = getattr(cmd.distribution, 'zip_safe', None) safe = getattr(cmd.distribution, 'zip_safe', None)
from setuptools.command import bdist_egg
bdist_egg.write_safety_flag(cmd.egg_info, safe) bdist_egg.write_safety_flag(cmd.egg_info, safe)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment