Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 96bf7e8

Browse files
gvanrossumgvanrossum
committed
Fix test_frozen.
1 parent 79139b2 commit 96bf7e8

8 files changed

Lines changed: 91 additions & 91 deletions

File tree

‎Python/frozen.c‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,15 @@
1212
the appropriate bytes from M___main__.c. */
1313

1414
static unsigned char M___hello__[] = {
15-
99,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,
16-
0,64,0,0,0,115,9,0,0,0,100,0,0,71,72,100,
17-
1,0,83,40,2,0,0,0,115,14,0,0,0,72,101,108,
18-
108,111,32,119,111,114,108,100,46,46,46,78,40,0,0,0,
19-
0,40,0,0,0,0,40,0,0,0,0,40,0,0,0,0,
20-
115,8,0,0,0,104,101,108,108,111,46,112,121,115,8,0,
21-
0,0,60,109,111,100,117,108,101,62,1,0,0,0,115,0,
22-
0,0,0,
15+
99,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,
16+
0,64,0,0,0,115,14,0,0,0,101,0,0,100,0,0,
17+
131,1,0,1,100,1,0,83,40,2,0,0,0,115,14,0,
18+
0,0,72,101,108,108,111,32,119,111,114,108,100,46,46,46,
19+
78,40,1,0,0,0,116,5,0,0,0,112,114,105,110,116,
20+
40,0,0,0,0,40,0,0,0,0,40,0,0,0,0,115,
21+
8,0,0,0,104,101,108,108,111,46,112,121,115,8,0,0,
22+
0,60,109,111,100,117,108,101,62,1,0,0,0,115,0,0,
23+
0,0,
2324
};
2425

2526
#define SIZE (int)sizeof(M___hello__)

‎Tools/freeze/bkfile.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ def __init__(self, file, mode, bufsize):
2525
self.readline = self.__file.readline
2626
self.readlines = self.__file.readlines
2727
self.seek = self.__file.seek
28-
self.softspace = self.__file.softspace
2928
self.tell = self.__file.tell
3029
self.truncate = self.__file.truncate
3130
self.write = self.__file.write

‎Tools/freeze/freeze.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ def main():
162162
# proces option arguments
163163
for o, a in opts:
164164
if o == '-h':
165-
print __doc__
165+
print(__doc__)
166166
return
167167
if o == '-d':
168168
debug = debug + 1
@@ -222,7 +222,7 @@ def main():
222222
if win:
223223
extensions_c = 'frozen_extensions.c'
224224
if ishome:
225-
print "(Using Python source directory)"
225+
print("(Using Python source directory)")
226226
binlib = exec_prefix
227227
incldir = os.path.join(prefix, 'Include')
228228
config_h_dir = exec_prefix
@@ -310,7 +310,7 @@ def main():
310310
if odir and not os.path.isdir(odir):
311311
try:
312312
os.mkdir(odir)
313-
print "Created output directory", odir
313+
print("Created output directory", odir)
314314
except os.error as msg:
315315
usage('%s: mkdir failed (%s)' % (odir, str(msg)))
316316
base = ''
@@ -371,7 +371,7 @@ def main():
371371

372372
if debug > 0:
373373
mf.report()
374-
print
374+
print()
375375
dict = mf.modules
376376

377377
if error_if_any_missing:
@@ -479,18 +479,18 @@ def main():
479479
# Done!
480480

481481
if odir:
482-
print 'Now run "make" in', odir,
483-
print 'to build the target:', base_target
482+
print('Now run "make" in', odir, end=' ')
483+
print('to build the target:', base_target)
484484
else:
485-
print 'Now run "make" to build the target:', base_target
485+
print('Now run "make" to build the target:', base_target)
486486

487487

488488
# Print usage message and exit
489489

490490
def usage(msg):
491491
sys.stdout = sys.stderr
492-
print "Error:", msg
493-
print "Use ``%s -h'' for help" % sys.argv[0]
492+
print("Error:", msg)
493+
print("Use ``%s -h'' for help" % sys.argv[0])
494494
sys.exit(2)
495495

496496

‎Tools/freeze/hello.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
print 'Hello world...'
1+
print('Hello world...')

‎Tools/freeze/makeconfig.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ def makeconfig(infp, outfp, modules, with_ifdef=0):
4040
def test():
4141
import sys
4242
if not sys.argv[3:]:
43-
print 'usage: python makeconfig.py config.c.in outputfile',
44-
print 'modulename ...'
43+
print('usage: python makeconfig.py config.c.in outputfile', end=' ')
44+
print('modulename ...')
4545
sys.exit(2)
4646
if sys.argv[1] == '-':
4747
infp = sys.stdin

‎Tools/freeze/makefreeze.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ def makefreeze(base, dict, debug=0, entry_point=None, fail_import=()):
4343
outfp = bkfile.open(base + file, 'w')
4444
files.append(file)
4545
if debug:
46-
print "freezing", mod, "..."
46+
print("freezing", mod, "...")
4747
str = marshal.dumps(m.__code__)
4848
size = len(str)
4949
if m.__path__:
@@ -53,7 +53,7 @@ def makefreeze(base, dict, debug=0, entry_point=None, fail_import=()):
5353
writecode(outfp, mangled, str)
5454
outfp.close()
5555
if debug:
56-
print "generating table of frozen modules"
56+
print("generating table of frozen modules")
5757
outfp = bkfile.open(base + 'frozen.c', 'w')
5858
for mod, mangled, size in done:
5959
outfp.write('extern unsigned char M_%s[];\n' % mangled)

‎Tools/freeze/parsesetup.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,29 +84,29 @@ def test():
8484
import sys
8585
import os
8686
if not sys.argv[1:]:
87-
print 'usage: python parsesetup.py Makefile*|Setup* ...'
87+
print('usage: python parsesetup.py Makefile*|Setup* ...')
8888
sys.exit(2)
8989
for arg in sys.argv[1:]:
9090
base = os.path.basename(arg)
9191
if base[:8] == 'Makefile':
92-
print 'Make style parsing:', arg
92+
print('Make style parsing:', arg)
9393
v = getmakevars(arg)
9494
prdict(v)
9595
elif base[:5] == 'Setup':
96-
print 'Setup style parsing:', arg
96+
print('Setup style parsing:', arg)
9797
m, v = getsetupinfo(arg)
9898
prdict(m)
9999
prdict(v)
100100
else:
101-
print arg, 'is neither a Makefile nor a Setup file'
102-
print '(name must begin with "Makefile" or "Setup")'
101+
print(arg, 'is neither a Makefile nor a Setup file')
102+
print('(name must begin with "Makefile" or "Setup")')
103103

104104
def prdict(d):
105105
keys = d.keys()
106106
keys.sort()
107107
for key in keys:
108108
value = d[key]
109-
print "%-15s" % key, str(value)
109+
print("%-15s" % key, str(value))
110110

111111
if __name__ == '__main__':
112112
test()

‎Tools/freeze/winmakemakefile.py‎

Lines changed: 62 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -52,29 +52,29 @@ def makemakefile(outfp, vars, files, target):
5252

5353
def realwork(vars, moddefns, target):
5454
version_suffix = "%r%r" % sys.version_info[:2]
55-
print "# Makefile for Microsoft Visual C++ generated by freeze.py script"
56-
print
57-
print 'target = %s' % target
58-
print 'pythonhome = %s' % vars['prefix']
59-
print
60-
print 'DEBUG=0 # Set to 1 to use the _d versions of Python.'
61-
print '!IF $(DEBUG)'
62-
print 'debug_suffix=_d'
63-
print 'c_debug=/Zi /Od /DDEBUG /D_DEBUG'
64-
print 'l_debug=/DEBUG'
65-
print 'temp_dir=Build\\Debug'
66-
print '!ELSE'
67-
print 'debug_suffix='
68-
print 'c_debug=/Ox'
69-
print 'l_debug='
70-
print 'temp_dir=Build\\Release'
71-
print '!ENDIF'
72-
print
73-
74-
print '# The following line assumes you have built Python using the standard instructions'
75-
print '# Otherwise fix the following line to point to the library.'
76-
print 'pythonlib = "$(pythonhome)/pcbuild/python%s$(debug_suffix).lib"' % version_suffix
77-
print
55+
print("# Makefile for Microsoft Visual C++ generated by freeze.py script")
56+
print()
57+
print('target = %s' % target)
58+
print('pythonhome = %s' % vars['prefix'])
59+
print()
60+
print('DEBUG=0 # Set to 1 to use the _d versions of Python.')
61+
print('!IF $(DEBUG)')
62+
print('debug_suffix=_d')
63+
print('c_debug=/Zi /Od /DDEBUG /D_DEBUG')
64+
print('l_debug=/DEBUG')
65+
print('temp_dir=Build\\Debug')
66+
print('!ELSE')
67+
print('debug_suffix=')
68+
print('c_debug=/Ox')
69+
print('l_debug=')
70+
print('temp_dir=Build\\Release')
71+
print('!ENDIF')
72+
print()
73+
74+
print('# The following line assumes you have built Python using the standard instructions')
75+
print('# Otherwise fix the following line to point to the library.')
76+
print('pythonlib = "$(pythonhome)/pcbuild/python%s$(debug_suffix).lib"' % version_suffix)
77+
print()
7878

7979
# We only ever write one "entry point" symbol - either
8080
# "main" or "WinMain". Therefore, there is no need to
@@ -88,59 +88,59 @@ def realwork(vars, moddefns, target):
8888
target_ext = ".dll"
8989

9090

91-
print "# As the target uses Python%s.dll, we must use this compiler option!" % version_suffix
92-
print "cdl = /MD"
93-
print
94-
print "all: $(target)$(debug_suffix)%s" % (target_ext)
95-
print
91+
print("# As the target uses Python%s.dll, we must use this compiler option!" % version_suffix)
92+
print("cdl = /MD")
93+
print()
94+
print("all: $(target)$(debug_suffix)%s" % (target_ext))
95+
print()
9696

97-
print '$(temp_dir):'
98-
print ' if not exist $(temp_dir)\. mkdir $(temp_dir)'
99-
print
97+
print('$(temp_dir):')
98+
print(' if not exist $(temp_dir)\. mkdir $(temp_dir)')
99+
print()
100100

101101
objects = []
102102
libs = ["shell32.lib", "comdlg32.lib", "wsock32.lib", "user32.lib", "oleaut32.lib"]
103103
for moddefn in moddefns:
104-
print "# Module", moddefn.name
104+
print("# Module", moddefn.name)
105105
for file in moddefn.sourceFiles:
106106
base = os.path.basename(file)
107107
base, ext = os.path.splitext(base)
108108
objects.append(base + ".obj")
109-
print '$(temp_dir)\%s.obj: "%s"' % (base, file)
110-
print "\t@$(CC) -c -nologo /Fo$* $(cdl) $(c_debug) /D BUILD_FREEZE",
111-
print '"-I$(pythonhome)/Include" "-I$(pythonhome)/PC" \\'
112-
print "\t\t$(cflags) $(cdebug) $(cinclude) \\"
109+
print('$(temp_dir)\%s.obj: "%s"' % (base, file))
110+
print("\t@$(CC) -c -nologo /Fo$* $(cdl) $(c_debug) /D BUILD_FREEZE", end=' ')
111+
print('"-I$(pythonhome)/Include" "-I$(pythonhome)/PC" \\')
112+
print("\t\t$(cflags) $(cdebug) $(cinclude) \\")
113113
extra = moddefn.GetCompilerOptions()
114114
if extra:
115-
print "\t\t%s \\" % (' '.join(extra),)
116-
print '\t\t"%s"' % file
117-
print
115+
print("\t\t%s \\" % (' '.join(extra),))
116+
print('\t\t"%s"' % file)
117+
print()
118118

119119
# Add .lib files this module needs
120120
for modlib in moddefn.GetLinkerLibs():
121121
if modlib not in libs:
122122
libs.append(modlib)
123123

124-
print "ADDN_LINK_FILES=",
125-
for addn in vars['addn_link']: print '"%s"' % (addn),
126-
print ; print
127-
128-
print "OBJS=",
129-
for obj in objects: print '"$(temp_dir)\%s"' % (obj),
130-
print ; print
131-
132-
print "LIBS=",
133-
for lib in libs: print '"%s"' % (lib),
134-
print ; print
135-
136-
print "$(target)$(debug_suffix)%s: $(temp_dir) $(OBJS)" % (target_ext)
137-
print "\tlink -out:$(target)$(debug_suffix)%s %s" % (target_ext, target_link_flags),
138-
print "\t$(OBJS) \\"
139-
print "\t$(LIBS) \\"
140-
print "\t$(ADDN_LINK_FILES) \\"
141-
print "\t$(pythonlib) $(lcustom) $(l_debug)\\"
142-
print "\t$(resources)"
143-
print
144-
print "clean:"
145-
print "\t-rm -f *.obj"
146-
print "\t-rm -f $(target).exe"
124+
print("ADDN_LINK_FILES=", end=' ')
125+
for addn in vars['addn_link']: print('"%s"' % (addn), end=' ')
126+
print() ; print()
127+
128+
print("OBJS=", end=' ')
129+
for obj in objects: print('"$(temp_dir)\%s"' % (obj), end=' ')
130+
print() ; print()
131+
132+
print("LIBS=", end=' ')
133+
for lib in libs: print('"%s"' % (lib), end=' ')
134+
print() ; print()
135+
136+
print("$(target)$(debug_suffix)%s: $(temp_dir) $(OBJS)" % (target_ext))
137+
print("\tlink -out:$(target)$(debug_suffix)%s %s" % (target_ext, target_link_flags), end=' ')
138+
print("\t$(OBJS) \\")
139+
print("\t$(LIBS) \\")
140+
print("\t$(ADDN_LINK_FILES) \\")
141+
print("\t$(pythonlib) $(lcustom) $(l_debug)\\")
142+
print("\t$(resources)")
143+
print()
144+
print("clean:")
145+
print("\t-rm -f *.obj")
146+
print("\t-rm -f $(target).exe")

0 commit comments

Comments
 (0)