mirror of
https://github.com/python/cpython.git
synced 2025-09-26 18:29:57 +00:00
Whitespace normalization.
This commit is contained in:
parent
8d7626c23f
commit
a45cacfc1c
7 changed files with 17 additions and 17 deletions
|
@ -372,7 +372,7 @@ class CodeGenerator:
|
||||||
ndecorators = len(node.decorators.nodes)
|
ndecorators = len(node.decorators.nodes)
|
||||||
else:
|
else:
|
||||||
ndecorators = 0
|
ndecorators = 0
|
||||||
|
|
||||||
gen = self.FunctionGen(node, self.scopes, isLambda,
|
gen = self.FunctionGen(node, self.scopes, isLambda,
|
||||||
self.class_name, self.get_module())
|
self.class_name, self.get_module())
|
||||||
walk(node.code, gen)
|
walk(node.code, gen)
|
||||||
|
|
|
@ -29,7 +29,7 @@ def nametofont(name):
|
||||||
"""Given the name of a tk named font, returns a Font representation.
|
"""Given the name of a tk named font, returns a Font representation.
|
||||||
"""
|
"""
|
||||||
return Font(name=name, exists=True)
|
return Font(name=name, exists=True)
|
||||||
|
|
||||||
class Font:
|
class Font:
|
||||||
|
|
||||||
"""Represents a named font.
|
"""Represents a named font.
|
||||||
|
@ -50,7 +50,7 @@ class Font:
|
||||||
slant -- font slant: ROMAN, ITALIC
|
slant -- font slant: ROMAN, ITALIC
|
||||||
underline -- font underlining: false (0), true (1)
|
underline -- font underlining: false (0), true (1)
|
||||||
overstrike -- font strikeout: false (0), true (1)
|
overstrike -- font strikeout: false (0), true (1)
|
||||||
|
|
||||||
"""
|
"""
|
||||||
|
|
||||||
def _set(self, kw):
|
def _set(self, kw):
|
||||||
|
@ -95,7 +95,7 @@ class Font:
|
||||||
root.tk.call("font", "configure", self.name, *font)
|
root.tk.call("font", "configure", self.name, *font)
|
||||||
else:
|
else:
|
||||||
# create new font (raises TclError if the font exists)
|
# create new font (raises TclError if the font exists)
|
||||||
root.tk.call("font", "create", self.name, *font)
|
root.tk.call("font", "create", self.name, *font)
|
||||||
self.delete_font = True
|
self.delete_font = True
|
||||||
# backlinks!
|
# backlinks!
|
||||||
self._root = root
|
self._root = root
|
||||||
|
@ -120,7 +120,7 @@ class Font:
|
||||||
self._call("font", "delete", self.name)
|
self._call("font", "delete", self.name)
|
||||||
except (AttributeError, Tkinter.TclError):
|
except (AttributeError, Tkinter.TclError):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
def copy(self):
|
def copy(self):
|
||||||
"Return a distinct copy of the current font"
|
"Return a distinct copy of the current font"
|
||||||
return Font(self._root, **self.actual())
|
return Font(self._root, **self.actual())
|
||||||
|
|
|
@ -1,13 +1,13 @@
|
||||||
# Generated by h2py from /usr/include/netinet/in.h
|
# Generated by h2py from /usr/include/netinet/in.h
|
||||||
|
|
||||||
# Included from sys/cdefs.h
|
# Included from sys/cdefs.h
|
||||||
def __P(protos): return protos
|
def __P(protos): return protos
|
||||||
|
|
||||||
def __STRING(x): return #x
|
def __STRING(x): return #x
|
||||||
|
|
||||||
def __XSTRING(x): return __STRING(x)
|
def __XSTRING(x): return __STRING(x)
|
||||||
|
|
||||||
def __P(protos): return ()
|
def __P(protos): return ()
|
||||||
|
|
||||||
def __STRING(x): return "x"
|
def __STRING(x): return "x"
|
||||||
|
|
||||||
|
|
|
@ -404,7 +404,7 @@ symbolic links encountered in the path."""
|
||||||
bits = ['/'] + filename.split('/')[1:]
|
bits = ['/'] + filename.split('/')[1:]
|
||||||
else:
|
else:
|
||||||
bits = filename.split('/')
|
bits = filename.split('/')
|
||||||
|
|
||||||
for i in range(2, len(bits)+1):
|
for i in range(2, len(bits)+1):
|
||||||
component = join(*bits[0:i])
|
component = join(*bits[0:i])
|
||||||
# Resolve symbolic links.
|
# Resolve symbolic links.
|
||||||
|
@ -415,10 +415,10 @@ symbolic links encountered in the path."""
|
||||||
return abspath(join(*([component] + bits[i:])))
|
return abspath(join(*([component] + bits[i:])))
|
||||||
else:
|
else:
|
||||||
newpath = join(*([resolved] + bits[i:]))
|
newpath = join(*([resolved] + bits[i:]))
|
||||||
return realpath(newpath)
|
return realpath(newpath)
|
||||||
|
|
||||||
return abspath(filename)
|
return abspath(filename)
|
||||||
|
|
||||||
|
|
||||||
def _resolve_link(path):
|
def _resolve_link(path):
|
||||||
"""Internal helper function. Takes a path and follows symlinks
|
"""Internal helper function. Takes a path and follows symlinks
|
||||||
|
|
|
@ -33,6 +33,6 @@ try:
|
||||||
if nl_radixchar != li_radixchar:
|
if nl_radixchar != li_radixchar:
|
||||||
print "%r != %r" % (nl_radixchar, li_radixchar)
|
print "%r != %r" % (nl_radixchar, li_radixchar)
|
||||||
if not saw_locale:
|
if not saw_locale:
|
||||||
raise ImportError, "None of the listed locales found"
|
raise ImportError, "None of the listed locales found"
|
||||||
finally:
|
finally:
|
||||||
setlocale(LC_NUMERIC, oldlocale)
|
setlocale(LC_NUMERIC, oldlocale)
|
||||||
|
|
|
@ -397,7 +397,7 @@ class PosixPathTest(unittest.TestCase):
|
||||||
def test_realpath(self):
|
def test_realpath(self):
|
||||||
self.assert_("foo" in realpath("foo"))
|
self.assert_("foo" in realpath("foo"))
|
||||||
self.assertRaises(TypeError, posixpath.realpath)
|
self.assertRaises(TypeError, posixpath.realpath)
|
||||||
|
|
||||||
if hasattr(os, "symlink"):
|
if hasattr(os, "symlink"):
|
||||||
def test_realpath_basic(self):
|
def test_realpath_basic(self):
|
||||||
# Basic operation.
|
# Basic operation.
|
||||||
|
@ -406,7 +406,7 @@ class PosixPathTest(unittest.TestCase):
|
||||||
self.assertEqual(realpath(ABSTFN), ABSTFN+"1")
|
self.assertEqual(realpath(ABSTFN), ABSTFN+"1")
|
||||||
finally:
|
finally:
|
||||||
self.safe_remove(ABSTFN)
|
self.safe_remove(ABSTFN)
|
||||||
|
|
||||||
def test_realpath_symlink_loops(self):
|
def test_realpath_symlink_loops(self):
|
||||||
# Bug #930024, return the path unchanged if we get into an infinite
|
# Bug #930024, return the path unchanged if we get into an infinite
|
||||||
# symlink loop.
|
# symlink loop.
|
||||||
|
@ -429,7 +429,7 @@ class PosixPathTest(unittest.TestCase):
|
||||||
self.safe_remove(ABSTFN+"1")
|
self.safe_remove(ABSTFN+"1")
|
||||||
self.safe_remove(ABSTFN+"2")
|
self.safe_remove(ABSTFN+"2")
|
||||||
|
|
||||||
def test_realpath_resolve_parents(self):
|
def test_realpath_resolve_parents(self):
|
||||||
# We also need to resolve any symlinks in the parents of a relative
|
# We also need to resolve any symlinks in the parents of a relative
|
||||||
# path passed to realpath. E.g.: current working directory is
|
# path passed to realpath. E.g.: current working directory is
|
||||||
# /usr/doc with 'doc' being a symlink to /usr/share/doc. We call
|
# /usr/doc with 'doc' being a symlink to /usr/share/doc. We call
|
||||||
|
|
|
@ -3,7 +3,7 @@ try:
|
||||||
import zlib
|
import zlib
|
||||||
except ImportError:
|
except ImportError:
|
||||||
zlib = None
|
zlib = None
|
||||||
|
|
||||||
import zipfile, os, unittest
|
import zipfile, os, unittest
|
||||||
|
|
||||||
from StringIO import StringIO
|
from StringIO import StringIO
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue