mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Remove uses of string module and stat.ST_MODE

Browse source
This commit is contained in:
Neal Norwitz 2002-06-06 18:30:10 +00:00
parent ec7cf1382b
commit a312c3ade7
3 changed files with 7 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Lib/compiler/pyassem.py
View file

@ -2,7 +2,6 @@
import dis import dis
import new import new
import string
import sys import sys
import types import types
@ -246,7 +245,7 @@ class Block:
def __str__(self): def __str__(self):
insts = map(str, self.insts) insts = map(str, self.insts)
return "<block %s %d:\n%s>" % (self.label, self.bid, return "<block %s %d:\n%s>" % (self.label, self.bid,
string.join(insts, '\n')) '\n'.join(insts))
def emit(self, inst): def emit(self, inst):
op = inst[0] op = inst[0]
@ -713,10 +712,10 @@ class LineAddrTable:
self.lastoff = self.codeOffset self.lastoff = self.codeOffset
def getCode(self): def getCode(self):
return string.join(self.code, '') return ''.join(self.code)
def getTable(self): def getTable(self):
return string.join(map(chr, self.lnotab), '') return ''.join(map(chr, self.lnotab))
class StackDepthTracker: class StackDepthTracker:
# XXX 1. need to keep track of stack depth on jumps # XXX 1. need to keep track of stack depth on jumps

8
Lib/compiler/pycodegen.py
View file

@ -1,8 +1,6 @@
import imp import imp
import os import os
import marshal import marshal
import stat
import string
import struct import struct
import sys import sys
import types import types
@ -135,7 +133,7 @@ class Module(AbstractCompileMode):
# calling the interface that would also generate a 1-byte code # calling the interface that would also generate a 1-byte code
# to indicate the type of the value. simplest way to get the # to indicate the type of the value. simplest way to get the
# same effect is to call marshal and then skip the code. # same effect is to call marshal and then skip the code.
mtime = os.stat(self.filename)[stat.ST_MTIME] mtime = os.path.getmtime(self.filename)
mtime = struct.pack('i', mtime) mtime = struct.pack('i', mtime)
return self.MAGIC + mtime return self.MAGIC + mtime
@ -764,7 +762,7 @@ class CodeGenerator:
if VERSION > 1: if VERSION > 1:
self.emit('LOAD_CONST', None) self.emit('LOAD_CONST', None)
self.emit('IMPORT_NAME', name) self.emit('IMPORT_NAME', name)
mod = string.split(name, ".")[0] mod = name.split(".")[0]
self.storeName(alias or mod) self.storeName(alias or mod)
def visitFrom(self, node): def visitFrom(self, node):
@ -790,7 +788,7 @@ class CodeGenerator:
self.emit('POP_TOP') self.emit('POP_TOP')
def _resolveDots(self, name): def _resolveDots(self, name):
elts = string.split(name, ".") elts = name.split(".")
if len(elts) == 1: if len(elts) == 1:
return return
for elt in elts[1:]: for elt in elts[1:]:

3
Lib/compiler/transformer.py
View file

@ -28,7 +28,6 @@ import parser
# 1.5.2 for code branches executed in 1.5.2 # 1.5.2 for code branches executed in 1.5.2
import symbol import symbol
import token import token
import string
import sys import sys
error = 'walker.error' error = 'walker.error'
@ -111,7 +110,7 @@ class Transformer:
def parsesuite(self, text): def parsesuite(self, text):
"""Return a modified parse tree for the given suite text.""" """Return a modified parse tree for the given suite text."""
# Hack for handling non-native line endings on non-DOS like OSs. # Hack for handling non-native line endings on non-DOS like OSs.
text = string.replace(text, '\x0d', '') text = text.replace('\x0d', '')
return self.transform(parser.suite(text)) return self.transform(parser.suite(text))
def parseexpr(self, text): def parseexpr(self, text):