Merged revisions 85768-85771,85773,85777,85823,85825 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r85768 | georg.brandl | 2010-10-21 14:59:14 +0200 (Do, 21 Okt 2010) | 1 line

  #9919: fix off-by-one error in lineno command in Misc/gdbinit; also add newline to its output.
........
  r85769 | georg.brandl | 2010-10-21 15:01:23 +0200 (Do, 21 Okt 2010) | 1 line

  Fix missing import.
........
  r85770 | georg.brandl | 2010-10-21 15:29:10 +0200 (Do, 21 Okt 2010) | 1 line

  #3077: fix h2py substitution of character literals.
........
  r85771 | georg.brandl | 2010-10-21 15:34:51 +0200 (Do, 21 Okt 2010) | 1 line

  #1203650: allow larger list of files in windows makefile for freeze.
........
  r85773 | georg.brandl | 2010-10-21 15:45:52 +0200 (Do, 21 Okt 2010) | 1 line

  #4829: better error message for invalid file mode
........
  r85777 | georg.brandl | 2010-10-21 17:44:51 +0200 (Do, 21 Okt 2010) | 1 line

  Add .hgeol file for the Mercurial EOL extension.
........
  r85823 | georg.brandl | 2010-10-24 16:32:45 +0200 (So, 24 Okt 2010) | 1 line

  Fix style.
........
  r85825 | georg.brandl | 2010-10-24 17:16:02 +0200 (So, 24 Okt 2010) | 1 line

  Add documentation about the default warnings filters.
........

2 files changed, 7 insertions, 7 deletions

diff --git a/Tools/freeze/makeconfig.py b/Tools/freeze/makeconfig.py
index b9bfd08..06cbb60 100644
--- a/Tools/freeze/makeconfig.py
+++ b/Tools/freeze/makeconfig.py
@@ -1,5 +1,5 @@
 import re
-
+import sys
 
 # Write the config.c file
 
@@ -38,7 +38,6 @@ def makeconfig(infp, outfp, modules, with_ifdef=0):
 # Test program.
 
 def test():
-    import sys
     if not sys.argv[3:]:
         print 'usage: python makeconfig.py config.c.in outputfile',
         print 'modulename ...'
diff --git a/Tools/freeze/winmakemakefile.py b/Tools/freeze/winmakemakefile.py
index 8570f3d..1950d6b 100644
--- a/Tools/freeze/winmakemakefile.py
+++ b/Tools/freeze/winmakemakefile.py
@@ -134,12 +134,13 @@ def realwork(vars, moddefns, target):
     print ; print
 
     print "$(target)$(debug_suffix)%s: $(temp_dir) $(OBJS)" % (target_ext)
-    print "\tlink -out:$(target)$(debug_suffix)%s %s" % (target_ext, target_link_flags),
-    print "\t$(OBJS) \\"
-    print "\t$(LIBS) \\"
-    print "\t$(ADDN_LINK_FILES) \\"
-    print "\t$(pythonlib) $(lcustom) $(l_debug)\\"
+    print "\tlink -out:$(target)$(debug_suffix)%s %s" % (target_ext, target_link_flags), "@<<"
+    print "\t$(OBJS)"
+    print "\t$(LIBS)"
+    print "\t$(ADDN_LINK_FILES)"
+    print "\t$(pythonlib) $(lcustom) $(l_debug)"
     print "\t$(resources)"
+    print "<<"
     print
     print "clean:"
     print "\t-rm -f *.obj"