diff options
| author | ?ric Araujo <merwok@netwok.org> | 2011-11-23 13:58:51 +0100 |
|---|---|---|
| committer | ?ric Araujo <merwok@netwok.org> | 2011-11-23 13:58:51 +0100 |
| commit | c2e31bfbb48378e4ee91885046cc05765a54eabc (patch) | |
| tree | f92c28c6934ab61d526aac7227aee729f66c7238 /distutils2/command | |
| parent | c888a6c48cc14834274c8d6b8553c2383900774e (diff) | |
| parent | bb11fef9c016c68e89b8a83f1a95206859291d8a (diff) | |
| download | disutils2-c2e31bfbb48378e4ee91885046cc05765a54eabc.tar.gz | |
Merge compat/_backport cleanup from default.
For some reason, the diff for distutils/_backport/misc.py makes it seem
like it?s a new file instead of showing the changes I did during the
merge.
Diffstat (limited to 'distutils2/command')
| -rw-r--r-- | distutils2/command/build_py.py | 3 | ||||
| -rw-r--r-- | distutils2/command/build_scripts.py | 2 | ||||
| -rw-r--r-- | distutils2/command/install_lib.py | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/distutils2/command/build_py.py b/distutils2/command/build_py.py index f9b9bcd..1fe1d97 100644 --- a/distutils2/command/build_py.py +++ b/distutils2/command/build_py.py @@ -5,9 +5,10 @@ from glob import glob from distutils2 import logger from distutils2.util import convert_path -from distutils2.compat import Mixin2to3, cache_from_source +from distutils2.compat import Mixin2to3 from distutils2.errors import PackagingOptionError, PackagingFileError from distutils2.command.cmd import Command +from distutils2._backport.misc import cache_from_source # marking public APIs __all__ = ['build_py'] diff --git a/distutils2/command/build_scripts.py b/distutils2/command/build_scripts.py index e752ff1..7965558 100644 --- a/distutils2/command/build_scripts.py +++ b/distutils2/command/build_scripts.py @@ -8,8 +8,8 @@ from distutils2.command.cmd import Command from distutils2.util import convert_path, newer from distutils2 import logger from distutils2.compat import Mixin2to3 -from distutils2.compat import fsencode from distutils2._backport import sysconfig +from distutils2._backport.misc import fsencode # check if Python is called on the first line with this expression diff --git a/distutils2/command/install_lib.py b/distutils2/command/install_lib.py index 8ee1fd5..dfb32cf 100644 --- a/distutils2/command/install_lib.py +++ b/distutils2/command/install_lib.py @@ -3,9 +3,9 @@ import os from distutils2 import logger -from distutils2.compat import cache_from_source from distutils2.command.cmd import Command from distutils2.errors import PackagingOptionError +from distutils2._backport.misc import cache_from_source # Extension for Python source files. |
