##// END OF EJS Templates
util: drop the 'unpacker' helper...
Pierre-Yves David -
r25211:22f4ce49 default
parent child Browse files
Show More
@@ -299,7 +299,7 b' def _fm1purereadmarkers(data, off):'
299
299
300 # Loop on markers
300 # Loop on markers
301 stop = len(data) - _fm1fsize
301 stop = len(data) - _fm1fsize
302 ufixed = util.unpacker(_fm1fixed)
302 ufixed = struct.Struct(_fm1fixed).unpack
303
303
304 while off <= stop:
304 while off <= stop:
305 # read fixed part
305 # read fixed part
@@ -19,7 +19,7 b' import error, osutil, encoding, parsers'
19 import errno, shutil, sys, tempfile, traceback
19 import errno, shutil, sys, tempfile, traceback
20 import re as remod
20 import re as remod
21 import os, time, datetime, calendar, textwrap, signal, collections
21 import os, time, datetime, calendar, textwrap, signal, collections
22 import imp, socket, urllib, struct
22 import imp, socket, urllib
23 import gc
23 import gc
24
24
25 if os.name == 'nt':
25 if os.name == 'nt':
@@ -232,10 +232,6 b' except NameError:'
232 import subprocess
232 import subprocess
233 closefds = os.name == 'posix'
233 closefds = os.name == 'posix'
234
234
235 def unpacker(fmt):
236 """create a struct unpacker for the specified format"""
237 return struct.Struct(fmt).unpack
238
239 def popen2(cmd, env=None, newlines=False):
235 def popen2(cmd, env=None, newlines=False):
240 # Setting bufsize to -1 lets the system decide the buffer size.
236 # Setting bufsize to -1 lets the system decide the buffer size.
241 # The default for bufsize is 0, meaning unbuffered. This leads to
237 # The default for bufsize is 0, meaning unbuffered. This leads to
General Comments 0
You need to be logged in to leave comments. Login now