Merge commit 'e2cfefbb9c0af032e3dfd78b8a1600e6fa015462' into py3

knipknap · Mar 12, 2017 · 36d40e2 · 36d40e2
2 parents 53a4865 + e2cfefb
commit 36d40e2
Show file tree

Hide file tree

Showing 238 changed files with 130 additions and 7,747 deletions.
diff --git a/src/Exscript/Account.py → Exscript/Account.py b/src/Exscript/Account.py → Exscript/Account.py
diff --git a/src/Exscript/AccountManager.py → Exscript/AccountManager.py b/src/Exscript/AccountManager.py → Exscript/AccountManager.py
diff --git a/src/Exscript/AccountPool.py → Exscript/AccountPool.py b/src/Exscript/AccountPool.py → Exscript/AccountPool.py
diff --git a/src/Exscript/AccountProxy.py → Exscript/AccountProxy.py b/src/Exscript/AccountProxy.py → Exscript/AccountProxy.py
diff --git a/src/Exscript/FileLogger.py → Exscript/FileLogger.py b/src/Exscript/FileLogger.py → Exscript/FileLogger.py
diff --git a/src/Exscript/Host.py → Exscript/Host.py b/src/Exscript/Host.py → Exscript/Host.py
diff --git a/src/Exscript/Log.py → Exscript/Log.py b/src/Exscript/Log.py → Exscript/Log.py
diff --git a/src/Exscript/Logfile.py → Exscript/Logfile.py b/src/Exscript/Logfile.py → Exscript/Logfile.py
diff --git a/src/Exscript/Logger.py → Exscript/Logger.py b/src/Exscript/Logger.py → Exscript/Logger.py
diff --git a/src/Exscript/LoggerProxy.py → Exscript/LoggerProxy.py b/src/Exscript/LoggerProxy.py → Exscript/LoggerProxy.py
diff --git a/src/Exscript/PrivateKey.py → Exscript/PrivateKey.py b/src/Exscript/PrivateKey.py → Exscript/PrivateKey.py
diff --git a/src/Exscript/Queue.py → Exscript/Queue.py b/src/Exscript/Queue.py → Exscript/Queue.py
diff --git a/src/Exscript/__init__.py → Exscript/__init__.py b/src/Exscript/__init__.py → Exscript/__init__.py
diff --git a/src/Exscript/emulators/CommandSet.py → Exscript/emulators/CommandSet.py b/src/Exscript/emulators/CommandSet.py → Exscript/emulators/CommandSet.py
diff --git a/src/Exscript/emulators/IOSEmulator.py → Exscript/emulators/IOSEmulator.py b/src/Exscript/emulators/IOSEmulator.py → Exscript/emulators/IOSEmulator.py
diff --git a/src/Exscript/emulators/VirtualDevice.py → Exscript/emulators/VirtualDevice.py b/src/Exscript/emulators/VirtualDevice.py → Exscript/emulators/VirtualDevice.py
diff --git a/src/Exscript/emulators/__init__.py → Exscript/emulators/__init__.py b/src/Exscript/emulators/__init__.py → Exscript/emulators/__init__.py
diff --git a/src/Exscript/external/__init__.py → Exscript/external/__init__.py b/src/Exscript/external/__init__.py → Exscript/external/__init__.py
diff --git a/src/Exscript/external/otp/AppendixB.py → Exscript/external/otp/AppendixB.py b/src/Exscript/external/otp/AppendixB.py → Exscript/external/otp/AppendixB.py
diff --git a/src/Exscript/external/otp/__init__.py → Exscript/external/otp/__init__.py b/src/Exscript/external/otp/__init__.py → Exscript/external/otp/__init__.py
diff --git a/src/Exscript/external/otp/keywrangling.py → Exscript/external/otp/keywrangling.py b/src/Exscript/external/otp/keywrangling.py → Exscript/external/otp/keywrangling.py
diff --git a/src/Exscript/external/otp/otp.py → Exscript/external/otp/otp.py b/src/Exscript/external/otp/otp.py → Exscript/external/otp/otp.py
diff --git a/src/Exscript/interpreter/Append.py → Exscript/interpreter/Append.py b/src/Exscript/interpreter/Append.py → Exscript/interpreter/Append.py
diff --git a/src/Exscript/interpreter/Assign.py → Exscript/interpreter/Assign.py b/src/Exscript/interpreter/Assign.py → Exscript/interpreter/Assign.py
diff --git a/src/Exscript/interpreter/Code.py → Exscript/interpreter/Code.py b/src/Exscript/interpreter/Code.py → Exscript/interpreter/Code.py
diff --git a/src/Exscript/interpreter/Enter.py → Exscript/interpreter/Enter.py b/src/Exscript/interpreter/Enter.py → Exscript/interpreter/Enter.py
diff --git a/src/Exscript/interpreter/Exception.py → Exscript/interpreter/Exception.py b/src/Exscript/interpreter/Exception.py → Exscript/interpreter/Exception.py
diff --git a/src/Exscript/interpreter/Execute.py → Exscript/interpreter/Execute.py b/src/Exscript/interpreter/Execute.py → Exscript/interpreter/Execute.py
diff --git a/src/Exscript/interpreter/Expression.py → Exscript/interpreter/Expression.py b/src/Exscript/interpreter/Expression.py → Exscript/interpreter/Expression.py
diff --git a/src/Exscript/interpreter/ExpressionNode.py → Exscript/interpreter/ExpressionNode.py b/src/Exscript/interpreter/ExpressionNode.py → Exscript/interpreter/ExpressionNode.py
diff --git a/src/Exscript/interpreter/Extract.py → Exscript/interpreter/Extract.py b/src/Exscript/interpreter/Extract.py → Exscript/interpreter/Extract.py
diff --git a/src/Exscript/interpreter/Fail.py → Exscript/interpreter/Fail.py b/src/Exscript/interpreter/Fail.py → Exscript/interpreter/Fail.py
diff --git a/src/Exscript/interpreter/FunctionCall.py → Exscript/interpreter/FunctionCall.py b/src/Exscript/interpreter/FunctionCall.py → Exscript/interpreter/FunctionCall.py
diff --git a/src/Exscript/interpreter/IfCondition.py → Exscript/interpreter/IfCondition.py b/src/Exscript/interpreter/IfCondition.py → Exscript/interpreter/IfCondition.py
diff --git a/src/Exscript/interpreter/Loop.py → Exscript/interpreter/Loop.py b/src/Exscript/interpreter/Loop.py → Exscript/interpreter/Loop.py
diff --git a/src/Exscript/interpreter/Number.py → Exscript/interpreter/Number.py b/src/Exscript/interpreter/Number.py → Exscript/interpreter/Number.py
diff --git a/src/Exscript/interpreter/Parser.py → Exscript/interpreter/Parser.py b/src/Exscript/interpreter/Parser.py → Exscript/interpreter/Parser.py
diff --git a/src/Exscript/interpreter/Program.py → Exscript/interpreter/Program.py b/src/Exscript/interpreter/Program.py → Exscript/interpreter/Program.py
diff --git a/src/Exscript/interpreter/Regex.py → Exscript/interpreter/Regex.py b/src/Exscript/interpreter/Regex.py → Exscript/interpreter/Regex.py
diff --git a/src/Exscript/interpreter/Scope.py → Exscript/interpreter/Scope.py b/src/Exscript/interpreter/Scope.py → Exscript/interpreter/Scope.py
diff --git a/src/Exscript/interpreter/String.py → Exscript/interpreter/String.py b/src/Exscript/interpreter/String.py → Exscript/interpreter/String.py
diff --git a/src/Exscript/interpreter/Template.py → Exscript/interpreter/Template.py b/src/Exscript/interpreter/Template.py → Exscript/interpreter/Template.py
diff --git a/src/Exscript/interpreter/Term.py → Exscript/interpreter/Term.py b/src/Exscript/interpreter/Term.py → Exscript/interpreter/Term.py
diff --git a/src/Exscript/interpreter/Try.py → Exscript/interpreter/Try.py b/src/Exscript/interpreter/Try.py → Exscript/interpreter/Try.py
diff --git a/src/Exscript/interpreter/Variable.py → Exscript/interpreter/Variable.py b/src/Exscript/interpreter/Variable.py → Exscript/interpreter/Variable.py
diff --git a/src/Exscript/interpreter/__init__.py → Exscript/interpreter/__init__.py b/src/Exscript/interpreter/__init__.py → Exscript/interpreter/__init__.py
diff --git a/src/Exscript/parselib/Exception.py → Exscript/parselib/Exception.py b/src/Exscript/parselib/Exception.py → Exscript/parselib/Exception.py
diff --git a/src/Exscript/parselib/Lexer.py → Exscript/parselib/Lexer.py b/src/Exscript/parselib/Lexer.py → Exscript/parselib/Lexer.py
diff --git a/src/Exscript/parselib/Token.py → Exscript/parselib/Token.py b/src/Exscript/parselib/Token.py → Exscript/parselib/Token.py
diff --git a/src/Exscript/parselib/__init__.py → Exscript/parselib/__init__.py b/src/Exscript/parselib/__init__.py → Exscript/parselib/__init__.py
diff --git a/src/Exscript/protocols/Dummy.py → Exscript/protocols/Dummy.py b/src/Exscript/protocols/Dummy.py → Exscript/protocols/Dummy.py
diff --git a/src/Exscript/protocols/Exception.py → Exscript/protocols/Exception.py b/src/Exscript/protocols/Exception.py → Exscript/protocols/Exception.py
diff --git a/src/Exscript/protocols/OsGuesser.py → Exscript/protocols/OsGuesser.py b/src/Exscript/protocols/OsGuesser.py → Exscript/protocols/OsGuesser.py
diff --git a/src/Exscript/protocols/Protocol.py → Exscript/protocols/Protocol.py b/src/Exscript/protocols/Protocol.py → Exscript/protocols/Protocol.py
diff --git a/src/Exscript/protocols/SSH2.py → Exscript/protocols/SSH2.py b/src/Exscript/protocols/SSH2.py → Exscript/protocols/SSH2.py
diff --git a/src/Exscript/protocols/Telnet.py → Exscript/protocols/Telnet.py b/src/Exscript/protocols/Telnet.py → Exscript/protocols/Telnet.py
diff --git a/src/Exscript/protocols/__init__.py → Exscript/protocols/__init__.py b/src/Exscript/protocols/__init__.py → Exscript/protocols/__init__.py
diff --git a/src/Exscript/protocols/drivers/__init__.py → Exscript/protocols/drivers/__init__.py b/src/Exscript/protocols/drivers/__init__.py → Exscript/protocols/drivers/__init__.py
diff --git a/src/Exscript/protocols/drivers/ace.py → Exscript/protocols/drivers/ace.py b/src/Exscript/protocols/drivers/ace.py → Exscript/protocols/drivers/ace.py
diff --git a/src/Exscript/protocols/drivers/aironet.py → Exscript/protocols/drivers/aironet.py b/src/Exscript/protocols/drivers/aironet.py → Exscript/protocols/drivers/aironet.py
diff --git a/src/Exscript/protocols/drivers/aix.py → Exscript/protocols/drivers/aix.py b/src/Exscript/protocols/drivers/aix.py → Exscript/protocols/drivers/aix.py
diff --git a/...cript/protocols/drivers/arbor_peakflow.py → Exscript/protocols/drivers/arbor_peakflow.py b/...cript/protocols/drivers/arbor_peakflow.py → Exscript/protocols/drivers/arbor_peakflow.py
diff --git a/src/Exscript/protocols/drivers/aruba.py → Exscript/protocols/drivers/aruba.py b/src/Exscript/protocols/drivers/aruba.py → Exscript/protocols/drivers/aruba.py
diff --git a/src/Exscript/protocols/drivers/bigip.py → Exscript/protocols/drivers/bigip.py b/src/Exscript/protocols/drivers/bigip.py → Exscript/protocols/drivers/bigip.py
diff --git a/src/Exscript/protocols/drivers/brocade.py → Exscript/protocols/drivers/brocade.py b/src/Exscript/protocols/drivers/brocade.py → Exscript/protocols/drivers/brocade.py
diff --git a/src/Exscript/protocols/drivers/driver.py → Exscript/protocols/drivers/driver.py b/src/Exscript/protocols/drivers/driver.py → Exscript/protocols/drivers/driver.py
diff --git a/src/Exscript/protocols/drivers/enterasys.py → Exscript/protocols/drivers/enterasys.py b/src/Exscript/protocols/drivers/enterasys.py → Exscript/protocols/drivers/enterasys.py
diff --git a/...xscript/protocols/drivers/enterasys_wc.py → Exscript/protocols/drivers/enterasys_wc.py b/...xscript/protocols/drivers/enterasys_wc.py → Exscript/protocols/drivers/enterasys_wc.py
diff --git a/src/Exscript/protocols/drivers/eos.py → Exscript/protocols/drivers/eos.py b/src/Exscript/protocols/drivers/eos.py → Exscript/protocols/drivers/eos.py
diff --git a/...xscript/protocols/drivers/ericsson_ban.py → Exscript/protocols/drivers/ericsson_ban.py b/...xscript/protocols/drivers/ericsson_ban.py → Exscript/protocols/drivers/ericsson_ban.py
diff --git a/src/Exscript/protocols/drivers/fortios.py → Exscript/protocols/drivers/fortios.py b/src/Exscript/protocols/drivers/fortios.py → Exscript/protocols/drivers/fortios.py
diff --git a/src/Exscript/protocols/drivers/generic.py → Exscript/protocols/drivers/generic.py b/src/Exscript/protocols/drivers/generic.py → Exscript/protocols/drivers/generic.py
diff --git a/...xscript/protocols/drivers/hp_pro_curve.py → Exscript/protocols/drivers/hp_pro_curve.py b/...xscript/protocols/drivers/hp_pro_curve.py → Exscript/protocols/drivers/hp_pro_curve.py
diff --git a/src/Exscript/protocols/drivers/ios.py → Exscript/protocols/drivers/ios.py b/src/Exscript/protocols/drivers/ios.py → Exscript/protocols/drivers/ios.py
diff --git a/src/Exscript/protocols/drivers/ios_xr.py → Exscript/protocols/drivers/ios_xr.py b/src/Exscript/protocols/drivers/ios_xr.py → Exscript/protocols/drivers/ios_xr.py
diff --git a/src/Exscript/protocols/drivers/isam.py → Exscript/protocols/drivers/isam.py b/src/Exscript/protocols/drivers/isam.py → Exscript/protocols/drivers/isam.py
diff --git a/src/Exscript/protocols/drivers/junos.py → Exscript/protocols/drivers/junos.py b/src/Exscript/protocols/drivers/junos.py → Exscript/protocols/drivers/junos.py
diff --git a/src/Exscript/protocols/drivers/junos_erx.py → Exscript/protocols/drivers/junos_erx.py b/src/Exscript/protocols/drivers/junos_erx.py → Exscript/protocols/drivers/junos_erx.py
diff --git a/src/Exscript/protocols/drivers/mrv.py → Exscript/protocols/drivers/mrv.py b/src/Exscript/protocols/drivers/mrv.py → Exscript/protocols/drivers/mrv.py
diff --git a/src/Exscript/protocols/drivers/nxos.py → Exscript/protocols/drivers/nxos.py b/src/Exscript/protocols/drivers/nxos.py → Exscript/protocols/drivers/nxos.py
diff --git a/src/Exscript/protocols/drivers/one_os.py → Exscript/protocols/drivers/one_os.py b/src/Exscript/protocols/drivers/one_os.py → Exscript/protocols/drivers/one_os.py
diff --git a/src/Exscript/protocols/drivers/rios.py → Exscript/protocols/drivers/rios.py b/src/Exscript/protocols/drivers/rios.py → Exscript/protocols/drivers/rios.py
diff --git a/src/Exscript/protocols/drivers/shell.py → Exscript/protocols/drivers/shell.py b/src/Exscript/protocols/drivers/shell.py → Exscript/protocols/drivers/shell.py
diff --git a/...script/protocols/drivers/smart_edge_os.py → Exscript/protocols/drivers/smart_edge_os.py b/...script/protocols/drivers/smart_edge_os.py → Exscript/protocols/drivers/smart_edge_os.py
diff --git a/src/Exscript/protocols/drivers/sros.py → Exscript/protocols/drivers/sros.py b/src/Exscript/protocols/drivers/sros.py → Exscript/protocols/drivers/sros.py
diff --git a/src/Exscript/protocols/drivers/vrp.py → Exscript/protocols/drivers/vrp.py b/src/Exscript/protocols/drivers/vrp.py → Exscript/protocols/drivers/vrp.py
diff --git a/src/Exscript/protocols/drivers/vxworks.py → Exscript/protocols/drivers/vxworks.py b/src/Exscript/protocols/drivers/vxworks.py → Exscript/protocols/drivers/vxworks.py
diff --git a/src/Exscript/protocols/drivers/zte.py → Exscript/protocols/drivers/zte.py b/src/Exscript/protocols/drivers/zte.py → Exscript/protocols/drivers/zte.py
diff --git a/src/Exscript/protocols/telnetlib.py → Exscript/protocols/telnetlib.py b/src/Exscript/protocols/telnetlib.py → Exscript/protocols/telnetlib.py
diff --git a/src/Exscript/servers/HTTPd.py → Exscript/servers/HTTPd.py b/src/Exscript/servers/HTTPd.py → Exscript/servers/HTTPd.py
diff --git a/src/Exscript/servers/SSHd.py → Exscript/servers/SSHd.py b/src/Exscript/servers/SSHd.py → Exscript/servers/SSHd.py
diff --git a/src/Exscript/servers/Server.py → Exscript/servers/Server.py b/src/Exscript/servers/Server.py → Exscript/servers/Server.py
diff --git a/src/Exscript/servers/Telnetd.py → Exscript/servers/Telnetd.py b/src/Exscript/servers/Telnetd.py → Exscript/servers/Telnetd.py
diff --git a/src/Exscript/servers/__init__.py → Exscript/servers/__init__.py b/src/Exscript/servers/__init__.py → Exscript/servers/__init__.py
diff --git a/src/Exscript/stdlib/__init__.py → Exscript/stdlib/__init__.py b/src/Exscript/stdlib/__init__.py → Exscript/stdlib/__init__.py
diff --git a/src/Exscript/stdlib/connection.py → Exscript/stdlib/connection.py b/src/Exscript/stdlib/connection.py → Exscript/stdlib/connection.py
diff --git a/src/Exscript/stdlib/crypt.py → Exscript/stdlib/crypt.py b/src/Exscript/stdlib/crypt.py → Exscript/stdlib/crypt.py
diff --git a/src/Exscript/stdlib/file.py → Exscript/stdlib/file.py b/src/Exscript/stdlib/file.py → Exscript/stdlib/file.py
diff --git a/src/Exscript/stdlib/ipv4.py → Exscript/stdlib/ipv4.py b/src/Exscript/stdlib/ipv4.py → Exscript/stdlib/ipv4.py
diff --git a/src/Exscript/stdlib/list.py → Exscript/stdlib/list.py b/src/Exscript/stdlib/list.py → Exscript/stdlib/list.py
diff --git a/src/Exscript/stdlib/mysys.py → Exscript/stdlib/mysys.py b/src/Exscript/stdlib/mysys.py → Exscript/stdlib/mysys.py
diff --git a/src/Exscript/stdlib/string.py → Exscript/stdlib/string.py b/src/Exscript/stdlib/string.py → Exscript/stdlib/string.py
diff --git a/src/Exscript/stdlib/util.py → Exscript/stdlib/util.py b/src/Exscript/stdlib/util.py → Exscript/stdlib/util.py
diff --git a/src/Exscript/util/__init__.py → Exscript/util/__init__.py b/src/Exscript/util/__init__.py → Exscript/util/__init__.py
diff --git a/src/Exscript/util/buffer.py → Exscript/util/buffer.py b/src/Exscript/util/buffer.py → Exscript/util/buffer.py
diff --git a/src/Exscript/util/cast.py → Exscript/util/cast.py b/src/Exscript/util/cast.py → Exscript/util/cast.py
diff --git a/src/Exscript/util/crypt.py → Exscript/util/crypt.py b/src/Exscript/util/crypt.py → Exscript/util/crypt.py
diff --git a/src/Exscript/util/daemonize.py → Exscript/util/daemonize.py b/src/Exscript/util/daemonize.py → Exscript/util/daemonize.py
diff --git a/src/Exscript/util/decorator.py → Exscript/util/decorator.py b/src/Exscript/util/decorator.py → Exscript/util/decorator.py
diff --git a/src/Exscript/util/event.py → Exscript/util/event.py b/src/Exscript/util/event.py → Exscript/util/event.py
diff --git a/src/Exscript/util/file.py → Exscript/util/file.py b/src/Exscript/util/file.py → Exscript/util/file.py
diff --git a/src/Exscript/util/impl.py → Exscript/util/impl.py b/src/Exscript/util/impl.py → Exscript/util/impl.py
diff --git a/src/Exscript/util/interact.py → Exscript/util/interact.py b/src/Exscript/util/interact.py → Exscript/util/interact.py
diff --git a/src/Exscript/util/ip.py → Exscript/util/ip.py b/src/Exscript/util/ip.py → Exscript/util/ip.py
diff --git a/src/Exscript/util/ipv4.py → Exscript/util/ipv4.py b/src/Exscript/util/ipv4.py → Exscript/util/ipv4.py
diff --git a/src/Exscript/util/ipv6.py → Exscript/util/ipv6.py b/src/Exscript/util/ipv6.py → Exscript/util/ipv6.py
diff --git a/src/Exscript/util/log.py → Exscript/util/log.py b/src/Exscript/util/log.py → Exscript/util/log.py
diff --git a/src/Exscript/util/mail.py → Exscript/util/mail.py b/src/Exscript/util/mail.py → Exscript/util/mail.py
diff --git a/src/Exscript/util/match.py → Exscript/util/match.py b/src/Exscript/util/match.py → Exscript/util/match.py
diff --git a/src/Exscript/util/pidutil.py → Exscript/util/pidutil.py b/src/Exscript/util/pidutil.py → Exscript/util/pidutil.py
diff --git a/src/Exscript/util/report.py → Exscript/util/report.py b/src/Exscript/util/report.py → Exscript/util/report.py
diff --git a/src/Exscript/util/sigint.py → Exscript/util/sigint.py b/src/Exscript/util/sigint.py → Exscript/util/sigint.py
diff --git a/src/Exscript/util/sigintcatcher.py → Exscript/util/sigintcatcher.py b/src/Exscript/util/sigintcatcher.py → Exscript/util/sigintcatcher.py
diff --git a/src/Exscript/util/start.py → Exscript/util/start.py b/src/Exscript/util/start.py → Exscript/util/start.py
diff --git a/src/Exscript/util/syslog.py → Exscript/util/syslog.py b/src/Exscript/util/syslog.py → Exscript/util/syslog.py
diff --git a/src/Exscript/util/template.py → Exscript/util/template.py b/src/Exscript/util/template.py → Exscript/util/template.py
diff --git a/src/Exscript/util/tty.py → Exscript/util/tty.py b/src/Exscript/util/tty.py → Exscript/util/tty.py
diff --git a/src/Exscript/util/url.py → Exscript/util/url.py b/src/Exscript/util/url.py → Exscript/util/url.py
diff --git a/src/Exscript/util/weakmethod.py → Exscript/util/weakmethod.py b/src/Exscript/util/weakmethod.py → Exscript/util/weakmethod.py
diff --git a/src/Exscript/version.py → Exscript/version.py b/src/Exscript/version.py → Exscript/version.py
diff --git a/src/Exscript/workqueue/DBPipeline.py → Exscript/workqueue/DBPipeline.py b/src/Exscript/workqueue/DBPipeline.py → Exscript/workqueue/DBPipeline.py
diff --git a/src/Exscript/workqueue/Job.py → Exscript/workqueue/Job.py b/src/Exscript/workqueue/Job.py → Exscript/workqueue/Job.py
diff --git a/src/Exscript/workqueue/MainLoop.py → Exscript/workqueue/MainLoop.py b/src/Exscript/workqueue/MainLoop.py → Exscript/workqueue/MainLoop.py
diff --git a/src/Exscript/workqueue/Pipeline.py → Exscript/workqueue/Pipeline.py b/src/Exscript/workqueue/Pipeline.py → Exscript/workqueue/Pipeline.py
diff --git a/src/Exscript/workqueue/Task.py → Exscript/workqueue/Task.py b/src/Exscript/workqueue/Task.py → Exscript/workqueue/Task.py
diff --git a/src/Exscript/workqueue/WorkQueue.py → Exscript/workqueue/WorkQueue.py b/src/Exscript/workqueue/WorkQueue.py → Exscript/workqueue/WorkQueue.py
diff --git a/src/Exscript/workqueue/__init__.py → Exscript/workqueue/__init__.py b/src/Exscript/workqueue/__init__.py → Exscript/workqueue/__init__.py
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,2 +1 @@
-include src/Exscriptd/config/*.in
 include README.md
diff --git a/Makefile b/Makefile
@@ -11,7 +11,7 @@ DISTDIR=/pub/code/releases/$(NAME)
 .PHONY : clean
 clean:
 	find . -name "*.pyc" -o -name "*.pyo" | xargs -n1 rm -f
-	rm -Rf build src/*.egg-info
+	rm -Rf build *.egg-info
 	cd doc; make clean
 
 .PHONY : dist-clean

diff --git a/README.md b/README.md
@@ -1,12 +1,14 @@
-Exscript
-========
+# Exscript
+
+## Summary
 
 Exscript is a Python module and a template processor for automating network 
 connections over protocols such as Telnet or SSH. We attempt to create the 
 best possible set of tools for working with Telnet and SSH.
 
-Exscript is also an excellent and much more powerful Net::Telnet replacement, 
-so we welcome all you Perl developers!
+Exscript also provides a set of tools and functions for sysadmins, that
+simplify **regular expression matching**, **reporting** by email, **logging**,
+or **syslog** handling, **CSV parsing**, **ip address handling**, and many more.
 
 Exscript may be used to automate sessions with routers from Cisco, Juniper, 
 OneAccess, Huawei, or any others. If you want to configures machines 
@@ -18,22 +20,54 @@ The Exscript template language is also in some ways comparable to Expect,
 but has some unique features that make it a lot easier to use and understand 
 for non-developers.
 
+## Method 1: Using Exscript with Python
 
-Links
-=====
+```python
+from Exscript.util.start import start
+from Exscript.util.file import get_hosts_from_file
+from Exscript.util.file import get_accounts_from_file
 
-Mailing List: http://groups.google.com/group/exscript/
+def do_something(job, host, conn):
+    conn.execute('uname -a')
 
+accounts = get_accounts_from_file('accounts.cfg')
+hosts = get_hosts_from_file('myhosts.txt')
+start(accounts, hosts, do_something, max_threads=2)
+```
 
-Dependencies
-============
+Check out the Python tutorial:
 
-* Python >=2.6 , <=2.7 (no Python 3 yet)
-* Python-crypto
-* Paramiko
+https://github.com/knipknap/exscript/wiki/Python-API-Tutorial
+
+## Method 2: Using the Exscript command line tool
+
+Create a file named `test.exscript` with the following content:
+
+```
+uname -a
+```
+
+To run this Exscript template, just start Exscript using the following command:
+
+```
+exscript test.exscript ssh://localhost
+```
 
+Awesome fact: Just replace `ssh://` by `telnet://` and it should still work with Telnet devices.
 
-Installation
-============
+
+## Documentation
+
+Full documentation is here:
+
+https://github.com/knipknap/exscript/wiki
+
+## Installation
 
 Simply follow the [installation guide](https://github.com/knipknap/exscript/wiki/Installation-Guide "Installation Guide").
+
+## Dependencies
+
+* Python >=2.6 , <=2.7 (we are working on Python 3 support)
+* Python-crypto
+* Paramiko
diff --git a/TODO b/TODO
@@ -1,13 +1,5 @@
-Exscript
---------
 * Add tests for Transport class debug levels.
 * Add API docs for Exscript.parselib.
 * Test the exscript executable.
 * Test Queue constructor kwargs.
 * Create more stdlib tests like tests/templates/stdlib.crypt/.
-
-exscriptd
----------
-* Make daemons asynchronous.
-* Debug memory usage.
-* Add more tests.
diff --git a/doc/Makefile b/doc/Makefile
@@ -21,7 +21,7 @@ pdf:
 	# Copy the stdlib Python directory and modify it such that the
 	# generated documentation does not leak implementation details.
 	rm -Rf latex stdlib
-	cp -r ../src/Exscript/stdlib .
+	cp -r ../Exscript/stdlib .
 	mv stdlib/mysys.py stdlib/sys.py
 	sed -i 's/\(def [^(]*(\)scope,? ?/\1/' stdlib/*.py # Remove the scope arg
 	sed -i 's/\(def [^(]*\)_(/\1(/' stdlib/*.py      	 # Remove trailing _
@@ -61,7 +61,29 @@ handbook: pdf
 
 apidocs:
 	cd ..; ./version.sh
-	python mkapidoc.py
+	epydoc --name Exscript \
+        --exclude ^Exscript\.AccountManager$ \
+        --exclude ^Exscript\.Log$ \
+        --exclude ^Exscript\.Logfile$ \
+        --exclude ^Exscript\.LoggerProxy$ \
+        --exclude ^Exscript\.external$ \
+        --exclude ^Exscript\.interpreter$ \
+        --exclude ^Exscript\.parselib$ \
+        --exclude ^Exscript\.protocols\.OsGuesser$ \
+        --exclude ^Exscript\.protocols\.telnetlib$ \
+        --exclude ^Exscript\.stdlib$ \
+        --exclude ^Exscript\.workqueue$ \
+        --exclude ^Exscript\.version$ \
+        --exclude-introspect ^Exscript\.util\.sigintcatcher$ \
+		--html \
+		--no-private \
+		--introspect-only \
+		--no-source \
+		--no-frames \
+		--inheritance=included \
+		-v \
+		-o doc/api \
+		Exscript
 	cd ..; ./version.sh --reset
 
 clean:

diff --git a/doc/exscript-architecture.pdf b/doc/exscript-architecture.pdf