Skip to content

Commit

Permalink
Fade to black
Browse files Browse the repository at this point in the history
Is this commit spoiling git blame for you? Check out
.git-blame-ignore-revs in the root of the repository.
  • Loading branch information
twm committed Sep 13, 2020
1 parent c5fbd88 commit bc96c77
Show file tree
Hide file tree
Showing 787 changed files with 59,126 additions and 65,437 deletions.
33 changes: 13 additions & 20 deletions docs/names/examples/dns-service.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,13 @@
from twisted.python import usage



class Options(usage.Options):
synopsis = 'Usage: dns-service.py SERVICE PROTO DOMAINNAME'
synopsis = "Usage: dns-service.py SERVICE PROTO DOMAINNAME"

def parseArgs(self, service, proto, domainname):
self['service'] = service
self['proto'] = proto
self['domainname'] = domainname

self["service"] = service
self["proto"] = proto
self["domainname"] = domainname


def printResult(records, domainname):
Expand All @@ -43,13 +41,10 @@ def printResult(records, domainname):
answers, authority, additional = records
if answers:
sys.stdout.write(
domainname + ' IN \n ' +
'\n '.join(str(x.payload) for x in answers) +
'\n')
domainname + " IN \n " + "\n ".join(str(x.payload) for x in answers) + "\n"
)
else:
sys.stderr.write(
'ERROR: No SRV records found for name %r\n' % (domainname,))

sys.stderr.write("ERROR: No SRV records found for name %r\n" % (domainname,))


def printError(failure, domainname):
Expand All @@ -58,27 +53,25 @@ def printError(failure, domainname):
resolved.
"""
failure.trap(error.DNSNameError)
sys.stderr.write('ERROR: domain name not found %r\n' % (domainname,))

sys.stderr.write("ERROR: domain name not found %r\n" % (domainname,))


def main(reactor, *argv):
options = Options()
try:
options.parseOptions(argv)
except usage.UsageError as errortext:
sys.stderr.write(str(options) + '\n')
sys.stderr.write('ERROR: %s\n' % (errortext,))
sys.stderr.write(str(options) + "\n")
sys.stderr.write("ERROR: %s\n" % (errortext,))
raise SystemExit(1)

resolver = client.Resolver('/etc/resolv.conf')
domainname = '_%(service)s._%(proto)s.%(domainname)s' % options
resolver = client.Resolver("/etc/resolv.conf")
domainname = "_%(service)s._%(proto)s.%(domainname)s" % options
d = resolver.lookupService(domainname)
d.addCallback(printResult, domainname)
d.addErrback(printError, domainname)
return d



if __name__ == '__main__':
if __name__ == "__main__":
react(main, sys.argv[1:])
24 changes: 9 additions & 15 deletions docs/names/examples/gethostbyname.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,11 @@
from twisted.python import usage



class Options(usage.Options):
synopsis = 'Usage: gethostbyname.py HOSTNAME'
synopsis = "Usage: gethostbyname.py HOSTNAME"

def parseArgs(self, hostname):
self['hostname'] = hostname

self["hostname"] = hostname


def printResult(address, hostname):
Expand All @@ -38,11 +36,9 @@ def printResult(address, hostname):
found.
"""
if address:
sys.stdout.write(address + '\n')
sys.stdout.write(address + "\n")
else:
sys.stderr.write(
'ERROR: No IP addresses found for name %r\n' % (hostname,))

sys.stderr.write("ERROR: No IP addresses found for name %r\n" % (hostname,))


def printError(failure, hostname):
Expand All @@ -51,26 +47,24 @@ def printError(failure, hostname):
resolved.
"""
failure.trap(error.DNSNameError)
sys.stderr.write('ERROR: hostname not found %r\n' % (hostname,))

sys.stderr.write("ERROR: hostname not found %r\n" % (hostname,))


def main(reactor, *argv):
options = Options()
try:
options.parseOptions(argv)
except usage.UsageError as errortext:
sys.stderr.write(str(options) + '\n')
sys.stderr.write('ERROR: %s\n' % (errortext,))
sys.stderr.write(str(options) + "\n")
sys.stderr.write("ERROR: %s\n" % (errortext,))
raise SystemExit(1)

hostname = options['hostname']
hostname = options["hostname"]
d = client.getHostByName(hostname)
d.addCallback(printResult, hostname)
d.addErrback(printError, hostname)
return d



if __name__ == '__main__':
if __name__ == "__main__":
react(main, sys.argv[1:])
40 changes: 16 additions & 24 deletions docs/names/examples/multi_reverse_lookup.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,34 +19,31 @@
from twisted.python import usage



class Options(usage.Options):
synopsis = 'Usage: multi_reverse_lookup.py IPADDRESS [IPADDRESS]'
synopsis = "Usage: multi_reverse_lookup.py IPADDRESS [IPADDRESS]"

def parseArgs(self, *addresses):
self['addresses'] = addresses

self["addresses"] = addresses


def reverseNameFromIPv4Address(address):
"""
Return a reverse domain name for the given IPv4 address.
"""
tokens = list(reversed(address.split('.'))) + ['in-addr', 'arpa', '']
return '.'.join(tokens)

tokens = list(reversed(address.split("."))) + ["in-addr", "arpa", ""]
return ".".join(tokens)


def reverseNameFromIPv6Address(address):
"""
Return a reverse domain name for the given IPv6 address.
"""
# Expand addresses that are in compressed format eg ::1
fullHex = ''.join('%02x' % (ord(c),)
for c in socket.inet_pton(socket.AF_INET6, address))
tokens = list(reversed(fullHex)) + ['ip6', 'arpa', '']
return '.'.join(tokens)

fullHex = "".join(
"%02x" % (ord(c),) for c in socket.inet_pton(socket.AF_INET6, address)
)
tokens = list(reversed(fullHex)) + ["ip6", "arpa", ""]
return ".".join(tokens)


def reverseNameFromIPAddress(address):
Expand All @@ -61,7 +58,6 @@ def reverseNameFromIPAddress(address):
return reverseNameFromIPv4Address(address)



def printResult(result):
"""
Print a comma separated list of reverse domain names and associated pointer
Expand All @@ -70,10 +66,8 @@ def printResult(result):
answers, authority, additional = result
if answers:
sys.stdout.write(
', '.join(
'{} IN {}'.format(a.name.name, a.payload) for a in answers)
+ '\n')

", ".join("{} IN {}".format(a.name.name, a.payload) for a in answers) + "\n"
)


def printSummary(results):
Expand All @@ -82,22 +76,21 @@ def printSummary(results):
"""
statuses = zip(*results)[0]
sys.stdout.write(
'{} responses to {} queries'.format(
statuses.count(True), len(statuses)) + '\n')

"{} responses to {} queries".format(statuses.count(True), len(statuses)) + "\n"
)


def main(reactor, *argv):
options = Options()
try:
options.parseOptions(argv)
except usage.UsageError as errortext:
sys.stderr.write(str(options) + '\n')
sys.stderr.write('ERROR: %s\n' % (errortext,))
sys.stderr.write(str(options) + "\n")
sys.stderr.write("ERROR: %s\n" % (errortext,))
raise SystemExit(1)

pending = []
for address in options['addresses']:
for address in options["addresses"]:
pointerName = reverseNameFromIPAddress(address)
# Force a single 1s timeout, so that slow or offline servers don't
# adversely slow down the script.
Expand All @@ -110,6 +103,5 @@ def main(reactor, *argv):
return allResults



if __name__ == "__main__":
task.react(main, sys.argv[1:])
53 changes: 25 additions & 28 deletions docs/names/examples/testdns.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,11 @@
from twisted.python import usage



class Options(usage.Options):
synopsis = 'Usage: testdns.py DOMAINNAME'
synopsis = "Usage: testdns.py DOMAINNAME"

def parseArgs(self, domainname):
self['domainname'] = domainname

self["domainname"] = domainname


def formatRecords(records, heading):
Expand All @@ -34,25 +32,24 @@ def formatRecords(records, heading):
formatted string beneath the given heading.
"""
answers, authority, additional = records
lines = ['# ' + heading]
lines = ["# " + heading]
for a in answers:
line = [
a.name,
dns.QUERY_CLASSES.get(a.cls, 'UNKNOWN (%d)' % (a.cls,)),
a.payload]
lines.append(' '.join(str(word) for word in line))

return '\n'.join(line for line in lines)
dns.QUERY_CLASSES.get(a.cls, "UNKNOWN (%d)" % (a.cls,)),
a.payload,
]
lines.append(" ".join(str(word) for word in line))

return "\n".join(line for line in lines)


def printResults(results, domainname):
"""
Print the formatted results for each DNS record type.
"""
sys.stdout.write('# Domain Summary for %r\n' % (domainname,))
sys.stdout.write('\n\n'.join(results) + '\n')

sys.stdout.write("# Domain Summary for %r\n" % (domainname,))
sys.stdout.write("\n\n".join(results) + "\n")


def printError(failure, domainname):
Expand All @@ -63,35 +60,35 @@ def printError(failure, domainname):
failure.trap(defer.FirstError)
failure = failure.value.subFailure
failure.trap(error.DNSNameError)
sys.stderr.write('ERROR: domain name not found %r\n' % (domainname,))

sys.stderr.write("ERROR: domain name not found %r\n" % (domainname,))


def main(reactor, *argv):
options = Options()
try:
options.parseOptions(argv)
except usage.UsageError as errortext:
sys.stderr.write(str(options) + '\n')
sys.stderr.write('ERROR: %s\n' % (errortext,))
sys.stderr.write(str(options) + "\n")
sys.stderr.write("ERROR: %s\n" % (errortext,))
raise SystemExit(1)

domainname = options['domainname']
r = client.Resolver('/etc/resolv.conf')
d = defer.gatherResults([
r.lookupAddress(domainname).addCallback(
formatRecords, 'Addresses'),
domainname = options["domainname"]
r = client.Resolver("/etc/resolv.conf")
d = defer.gatherResults(
[
r.lookupAddress(domainname).addCallback(formatRecords, "Addresses"),
r.lookupMailExchange(domainname).addCallback(
formatRecords, 'Mail Exchangers'),
r.lookupNameservers(domainname).addCallback(
formatRecords, 'Nameservers'),
], consumeErrors=True)
formatRecords, "Mail Exchangers"
),
r.lookupNameservers(domainname).addCallback(formatRecords, "Nameservers"),
],
consumeErrors=True,
)

d.addCallback(printResults, domainname)
d.addErrback(printError, domainname)
return d



if __name__ == '__main__':
if __name__ == "__main__":
react(main, sys.argv[1:])
8 changes: 3 additions & 5 deletions docs/pair/examples/pairudp.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,9 @@
from twisted.python.log import startLogging



class MyProto(protocol.DatagramProtocol):
def datagramReceived(self, datagram, address):
print('from', address, 'received', repr(datagram))

print("from", address, "received", repr(datagram))


def main(reactor):
Expand All @@ -62,12 +60,12 @@ def main(reactor):
eth = EthernetProtocol()
eth.addProto(0x800, ip)

port = TuntapPort(interface='tap0', proto=eth, reactor=reactor)
port = TuntapPort(interface="tap0", proto=eth, reactor=reactor)
port.startListening()

# Run forever
return Deferred()


if __name__ == '__main__':
if __name__ == "__main__":
react(main, [])
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
if __name__ == "__main__":

_setup = {}
with open('src/twisted/python/_setup.py') as f:
with open("src/twisted/python/_setup.py") as f:
exec(f.read(), _setup)

try:
Expand Down
4 changes: 2 additions & 2 deletions src/twisted/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@

import sys
from twisted._version import __version__ as version

__version__ = version.short()

if sys.version_info < (3, 5):
raise Exception(
"This version of Twisted is not compatible with Python 3.4 "
"or below."
"This version of Twisted is not compatible with Python 3.4 " "or below."
)
4 changes: 2 additions & 2 deletions src/twisted/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import sys
from pkg_resources import load_entry_point

if __name__ == '__main__':
if __name__ == "__main__":
sys.exit(
load_entry_point('Twisted', 'console_scripts', 'twist')() # type: ignore[func-returns-value] # noqa
load_entry_point("Twisted", "console_scripts", "twist")() # type: ignore[func-returns-value] # noqa
)
Loading

0 comments on commit bc96c77

Please sign in to comment.