Commits

Hanno Schlichting committed 3d744f2

Fixed a couple more setuptools names to say distribute

Comments (0)

Files changed (10)

distribute.resources/distribute/resources/dist.py

 
     def check_version_conflict(self):
         if self.key=='distribute':
-            return      # ignore the inevitable setuptools self-conflicts  :(
+            return      # ignore the inevitable distribute self-conflicts  :(
 
         nsp = dict.fromkeys(self._get_metadata('namespace_packages.txt'))
         loc = normalize_path(self.location)

distribute/MANIFEST.in

-recursive-include setuptools *.py *.txt *.exe
+recursive-include distribute *.py *.txt *.exe
 recursive-include tests *.py *.c *.pyx
 recursive-include docs *.py *.txt Makefile
 recursive-include buildout *.py 

distribute/distribute/command/bdist_egg.py

-"""setuptools.command.bdist_egg
+"""distribute.command.bdist_egg
 
 Build .egg distributions"""
 

distribute/distribute/command/egg_info.py

-"""setuptools.command.egg_info
+"""distribute.command.egg_info
 
 Create a distribution's .egg-info directory and contents"""
 

distribute/distribute/core/dist.py

 _Distribution = _get_unpatched(_Distribution)
 
 try:
-    import setuptools
-    setuptools.dist._get_unpatched = _get_unpatched
+    import distribute.core
+    distribute.core.dist._get_unpatched = _get_unpatched
 except ImportError:
     pass
 

distribute/distribute/tests/__init__.py

-"""Tests for the 'setuptools' package"""
+"""Tests for the 'distribute' package"""
 import sys
 import os.path
 import unittest

distribute/distribute/tests/win_script_wrapper.txt

 Python Script Wrapper for Windows
 =================================
 
-setuptools includes wrappers for Python scripts that allows them to be
+distribute includes wrappers for Python scripts that allows them to be
 executed like regular windows programs.  There are 2 wrappers, once
 for command-line programs, cli.exe, and one for graphica programs,
 gui.exe.  These programs are almost identical, function pretty much
 Let's create a simple script, foo-script.py:
 
     >>> import os, sys, tempfile
-    >>> from setuptools.command.easy_install import nt_quote_arg
+    >>> from distribute.installer.command.easy_install import nt_quote_arg
     >>> sample_directory = tempfile.mkdtemp()
     >>> open(os.path.join(sample_directory, 'foo-script.py'), 'w').write(
     ... """#!%(python_exe)s
 Now let's test the GUI version with the simple scipt, bar-script.py:
 
     >>> import os, sys, tempfile
-    >>> from setuptools.command.easy_install import nt_quote_arg
+    >>> from distribute.installer.command.easy_install import nt_quote_arg
     >>> sample_directory = tempfile.mkdtemp()
     >>> open(os.path.join(sample_directory, 'bar-script.pyw'), 'w').write(
     ... """#!%(python_exe)s

distribute/launcher.c

-/*  Setuptools Script Launcher for Windows
+/*  Distribute Script Launcher for Windows
 
     This is a stub executable for Windows that functions somewhat like
     Effbot's "exemaker", in that it runs a script with the same name but
     sys.executable pointing to itself.  (Which means it won't work if you try
     to run another Python process using sys.executable.)
 
-    To build/rebuild with mingw32, do this in the setuptools project directory:
+    To build/rebuild with mingw32, do this in the distribute project directory:
 
-       gcc -DGUI=0           -mno-cygwin -O -s -o setuptools/cli.exe launcher.c
-       gcc -DGUI=1 -mwindows -mno-cygwin -O -s -o setuptools/gui.exe launcher.c
+       gcc -DGUI=0           -mno-cygwin -O -s -o distribute/core/cli.exe launcher.c
+       gcc -DGUI=1 -mwindows -mno-cygwin -O -s -o distribute/core/gui.exe launcher.c
 
     It links to msvcrt.dll, but this shouldn't be a problem since it doesn't
     actually run Python in the same process.  Note that using 'exec' instead

distribute/tests/shlib_test/hello.c

   static char *__pyx_argnames[] = {0};
   if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "", __pyx_argnames)) return 0;
 
-  /* "C:\cygwin\home\pje\setuptools\tests\shlib_test\hello.pyx":4 */
   __pyx_1 = PyString_FromString(get_hello_msg()); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4; goto __pyx_L1;}
   __pyx_r = __pyx_1;
   __pyx_1 = 0;
   if (PyObject_SetAttrString(__pyx_m, "__builtins__", __pyx_b) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; goto __pyx_L1;};
   if (__Pyx_InternStrings(__pyx_intern_tab) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; goto __pyx_L1;};
 
-  /* "C:\cygwin\home\pje\setuptools\tests\shlib_test\hello.pyx":3 */
   return;
   __pyx_L1:;
   __Pyx_AddTraceback("hello");

distribute/tests/shlib_test/setup.py

-from setuptools import setup, Extension, Library
+from distribute.core import setup, Extension, Library
 
 setup(
     name="shlib_test",