commit 1957eb4e54f7e1232e33f8c8e88eca4e5e9e59e4 Author: Damian Johnson atagar@torproject.org Date: Fri Apr 1 18:06:44 2016 -0700

Copyright headers

Adding headers to our files. Opting to start everything with 2016 (obviously goes back a lot further, but not worth while to dig through history to figure out the years - tricky due to renames). --- nyx/__init__.py | 3 +++ nyx/arguments.py | 3 +++ nyx/controller.py | 3 +++ nyx/curses.py | 3 +++ nyx/demo_glyphs.py | 2 +- nyx/log.py | 3 +++ nyx/menu/__init__.py | 3 +++ nyx/menu/actions.py | 3 +++ nyx/menu/item.py | 3 +++ nyx/menu/menu.py | 3 +++ nyx/panel/__init__.py | 3 +++ nyx/panel/config.py | 3 +++ nyx/panel/connection.py | 3 +++ nyx/panel/graph.py | 3 +++ nyx/panel/header.py | 3 +++ nyx/panel/log.py | 3 +++ nyx/panel/torrc.py | 3 +++ nyx/popups.py | 3 +++ nyx/starter.py | 3 +++ nyx/tracker.py | 3 +++ nyx/uninstall | 3 +++ run_nyx | 2 +- run_tests.py | 2 +- 23 files changed, 63 insertions(+), 3 deletions(-)

diff --git a/nyx/__init__.py b/nyx/__init__.py index abb8aea..33656f1 100644 --- a/nyx/__init__.py +++ b/nyx/__init__.py @@ -1,3 +1,6 @@ +# Copyright 2016, Damian Johnson and The Tor Project +# See LICENSE for licensing information + """ Tor curses monitoring application. """ diff --git a/nyx/arguments.py b/nyx/arguments.py index b758640..a01ebb9 100644 --- a/nyx/arguments.py +++ b/nyx/arguments.py @@ -1,3 +1,6 @@ +# Copyright 2016, Damian Johnson and The Tor Project +# See LICENSE for licensing information + """ Commandline argument parsing for nyx. """ diff --git a/nyx/controller.py b/nyx/controller.py index b70b218..1d1730a 100644 --- a/nyx/controller.py +++ b/nyx/controller.py @@ -1,3 +1,6 @@ +# Copyright 2016, Damian Johnson and The Tor Project +# See LICENSE for licensing information + """ Main interface loop for nyx, periodically redrawing the screen and issuing user input to the proper panels. diff --git a/nyx/curses.py b/nyx/curses.py index 8e41bb3..909a055 100644 --- a/nyx/curses.py +++ b/nyx/curses.py @@ -1,3 +1,6 @@ +# Copyright 2016, Damian Johnson and The Tor Project +# See LICENSE for licensing information + """ Toolkit for working with curses. Curses earns its name, and this abstracts away its usage providing us more easy to use high level functions. This abstraction diff --git a/nyx/demo_glyphs.py b/nyx/demo_glyphs.py index 7781139..7ca68ee 100755 --- a/nyx/demo_glyphs.py +++ b/nyx/demo_glyphs.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright 2014, Damian Johnson and The Tor Project +# Copyright 2016, Damian Johnson and The Tor Project # See LICENSE for licensing information

""" diff --git a/nyx/log.py b/nyx/log.py index aeae399..f461937 100644 --- a/nyx/log.py +++ b/nyx/log.py @@ -1,3 +1,6 @@ +# Copyright 2016, Damian Johnson and The Tor Project +# See LICENSE for licensing information + """ Logging utilities, primiarily short aliases for logging a message at various runlevels. diff --git a/nyx/menu/__init__.py b/nyx/menu/__init__.py index 54644fe..c195054 100644 --- a/nyx/menu/__init__.py +++ b/nyx/menu/__init__.py @@ -1,3 +1,6 @@ +# Copyright 2016, Damian Johnson and The Tor Project +# See LICENSE for licensing information + """ Resources for displaying the menu. """ diff --git a/nyx/menu/actions.py b/nyx/menu/actions.py index d37a9f6..a1199aa 100644 --- a/nyx/menu/actions.py +++ b/nyx/menu/actions.py @@ -1,3 +1,6 @@ +# Copyright 2016, Damian Johnson and The Tor Project +# See LICENSE for licensing information + """ Generates the menu for nyx, binding options with their related actions. """ diff --git a/nyx/menu/item.py b/nyx/menu/item.py index 026f14a..ef5e359 100644 --- a/nyx/menu/item.py +++ b/nyx/menu/item.py @@ -1,3 +1,6 @@ +# Copyright 2016, Damian Johnson and The Tor Project +# See LICENSE for licensing information + """ Menu item, representing an option in the drop-down menu. """ diff --git a/nyx/menu/menu.py b/nyx/menu/menu.py index 9b0dc20..5b719bb 100644 --- a/nyx/menu/menu.py +++ b/nyx/menu/menu.py @@ -1,3 +1,6 @@ +# Copyright 2016, Damian Johnson and The Tor Project +# See LICENSE for licensing information + """ Display logic for presenting the menu. """ diff --git a/nyx/panel/__init__.py b/nyx/panel/__init__.py index 34a6af1..0ae3fdb 100644 --- a/nyx/panel/__init__.py +++ b/nyx/panel/__init__.py @@ -1,3 +1,6 @@ +# Copyright 2016, Damian Johnson and The Tor Project +# See LICENSE for licensing information + """ Panels consisting the nyx interface. """ diff --git a/nyx/panel/config.py b/nyx/panel/config.py index dbbe65b..6de9e61 100644 --- a/nyx/panel/config.py +++ b/nyx/panel/config.py @@ -1,3 +1,6 @@ +# Copyright 2016, Damian Johnson and The Tor Project +# See LICENSE for licensing information + """ Panel presenting the configuration state for tor or nyx. Options can be edited and the resulting configuration files saved. diff --git a/nyx/panel/connection.py b/nyx/panel/connection.py index 76d123f..a26c0d2 100644 --- a/nyx/panel/connection.py +++ b/nyx/panel/connection.py @@ -1,3 +1,6 @@ +# Copyright 2016, Damian Johnson and The Tor Project +# See LICENSE for licensing information + """ Listing of the currently established connections tor has made. """ diff --git a/nyx/panel/graph.py b/nyx/panel/graph.py index b092ecc..4ef9af3 100644 --- a/nyx/panel/graph.py +++ b/nyx/panel/graph.py @@ -1,3 +1,6 @@ +# Copyright 2016, Damian Johnson and The Tor Project +# See LICENSE for licensing information + """ Graphs of tor related statistics. For example...

diff --git a/nyx/panel/header.py b/nyx/panel/header.py index 065ade1..7e83501 100644 --- a/nyx/panel/header.py +++ b/nyx/panel/header.py @@ -1,3 +1,6 @@ +# Copyright 2016, Damian Johnson and The Tor Project +# See LICENSE for licensing information + """ Top panel for every page, containing basic system and tor related information. This expands the information it presents to two columns if there's room diff --git a/nyx/panel/log.py b/nyx/panel/log.py index fc11aee..e2d7676 100644 --- a/nyx/panel/log.py +++ b/nyx/panel/log.py @@ -1,3 +1,6 @@ +# Copyright 2016, Damian Johnson and The Tor Project +# See LICENSE for licensing information + """ Panel providing a chronological log of events its been configured to listen for. This provides prepopulation from the log file and supports filtering by diff --git a/nyx/panel/torrc.py b/nyx/panel/torrc.py index 1e08742..23c86d3 100644 --- a/nyx/panel/torrc.py +++ b/nyx/panel/torrc.py @@ -1,3 +1,6 @@ +# Copyright 2016, Damian Johnson and The Tor Project +# See LICENSE for licensing information + """ Panel displaying the torrc or nyxrc with the validation done against it. """ diff --git a/nyx/popups.py b/nyx/popups.py index b01815c..06241a3 100644 --- a/nyx/popups.py +++ b/nyx/popups.py @@ -1,3 +1,6 @@ +# Copyright 2016, Damian Johnson and The Tor Project +# See LICENSE for licensing information + """ Functions for displaying popups in the interface. """ diff --git a/nyx/starter.py b/nyx/starter.py index 09f5057..b13190f 100644 --- a/nyx/starter.py +++ b/nyx/starter.py @@ -1,3 +1,6 @@ +# Copyright 2016, Damian Johnson and The Tor Project +# See LICENSE for licensing information + """ Command line application for monitoring Tor relays, providing real time status information. This starts the application, parsing arguments and getting a Tor diff --git a/nyx/tracker.py b/nyx/tracker.py index a772ff9..a5a4f00 100644 --- a/nyx/tracker.py +++ b/nyx/tracker.py @@ -1,3 +1,6 @@ +# Copyright 2016, Damian Johnson and The Tor Project +# See LICENSE for licensing information + """ Background tasks for gathering information about the tor process.

diff --git a/nyx/uninstall b/nyx/uninstall index d3e7f41..5f72d4d 100755 --- a/nyx/uninstall +++ b/nyx/uninstall @@ -1,4 +1,7 @@ #!/bin/sh +# Copyright 2016, Damian Johnson and The Tor Project +# See LICENSE for licensing information + files="/usr/bin/nyx /usr/share/man/man1/nyx.1.gz /usr/share/nyx"

for i in $files diff --git a/run_nyx b/run_nyx index 866e050..b6c7b94 100755 --- a/run_nyx +++ b/run_nyx @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright 2014, Damian Johnson and The Tor Project +# Copyright 2016, Damian Johnson and The Tor Project # See LICENSE for licensing information

import nyx diff --git a/run_tests.py b/run_tests.py index ae587bf..1c52132 100755 --- a/run_tests.py +++ b/run_tests.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright 2013, Damian Johnson and The Tor Project +# Copyright 2016, Damian Johnson and The Tor Project # See LICENSE for licensing information

"""