comparison mercurial/worker.py @ 43506:9f70512ae2cf

cleanup: remove pointless r-prefixes on single-quoted strings This is the promised second step on single-quoted strings. These had existed because our source transformer didn't turn r'' into b'', so we had tagged some strings as r-strings to get "native" strings on both Pythons. Now that the transformer is gone, we can dispense with this nonsense. Methodology: I ran hg locate 'set:added() or modified() or clean()' | egrep '.*\.py$' | xargs egrep --color=never -n -- \[\^b\]\[\^a-z\]r\'\[\^\'\\\\\]\*\'\[\^\'\ in an emacs grep-mode buffer, and then used a keyboard macro to iterate over the results and remove the r prefix as needed. # skip-blame removing unneeded r prefixes left over from Python 3 migration. Differential Revision: https://phab.mercurial-scm.org/D7306
author Augie Fackler <augie@google.com>
date Fri, 08 Nov 2019 11:19:20 -0800
parents 687b865b95ad
children cb52e619c99e
comparison
equal deleted inserted replaced
43505:47fac1692ede 43506:9f70512ae2cf
34 def countcpus(): 34 def countcpus():
35 '''try to count the number of CPUs on the system''' 35 '''try to count the number of CPUs on the system'''
36 36
37 # posix 37 # posix
38 try: 38 try:
39 n = int(os.sysconf(r'SC_NPROCESSORS_ONLN')) 39 n = int(os.sysconf('SC_NPROCESSORS_ONLN'))
40 if n > 0: 40 if n > 0:
41 return n 41 return n
42 except (AttributeError, ValueError): 42 except (AttributeError, ValueError):
43 pass 43 pass
44 44
224 os._exit(ret & 255) 224 os._exit(ret & 255)
225 pids.add(pid) 225 pids.add(pid)
226 selector = selectors.DefaultSelector() 226 selector = selectors.DefaultSelector()
227 for rfd, wfd in pipes: 227 for rfd, wfd in pipes:
228 os.close(wfd) 228 os.close(wfd)
229 selector.register(os.fdopen(rfd, r'rb', 0), selectors.EVENT_READ) 229 selector.register(os.fdopen(rfd, 'rb', 0), selectors.EVENT_READ)
230 230
231 def cleanup(): 231 def cleanup():
232 signal.signal(signal.SIGINT, oldhandler) 232 signal.signal(signal.SIGINT, oldhandler)
233 waitforworkers() 233 waitforworkers()
234 signal.signal(signal.SIGCHLD, oldchldhandler) 234 signal.signal(signal.SIGCHLD, oldchldhandler)