[tor-commits] [ooni-probe/master] Check spelling with codespell

art at torproject.org art at torproject.org
Fri Nov 20 14:41:59 UTC 2015


commit a02799fdc9fb687af2141f9938df8b2aac33b9d7
Author: Kevin Murray <spam at kdmurray.id.au>
Date:   Fri Sep 25 21:26:40 2015 +1000

    Check spelling with codespell
---
 HACKING                                                |    2 +-
 README.rst                                             |    2 +-
 Vagrantfile                                            |    2 +-
 data/ooniprobe.1                                       |    2 +-
 docs/source/index.rst                                  |    2 +-
 ooni/geoip.py                                          |    2 +-
 ooni/nettests/experimental/bridge_reachability/echo.py |    2 +-
 ooni/nettests/manipulation/dns_spoof.py                |    2 +-
 ooni/nettests/scanning/http_url_list.py                |    2 +-
 ooni/tests/test_settings.py                            |    4 ++--
 ooni/utils/txscapy.py                                  |    2 +-
 setup.py                                               |    2 +-
 var/old_notes.txt                                      |    2 +-
 var/proxooni-spec.txt                                  |    2 +-
 14 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/HACKING b/HACKING
index fdb3751..baa5bb0 100644
--- a/HACKING
+++ b/HACKING
@@ -206,7 +206,7 @@ Indentation
 Tabs or Spaces?
 ...............
 
-Everytime you insert a \t into any piece of code a kitten dies.
+Every time you insert a \t into any piece of code a kitten dies.
 
 Only spaces. Please.
 
diff --git a/README.rst b/README.rst
index 66b712c..9cb3042 100644
--- a/README.rst
+++ b/README.rst
@@ -40,7 +40,7 @@ aware of the fact that you are running ooniprobe. This means that if running
 network measurement tests is something considered to be illegal in your country
 then you could be spotted.
 
-Futhermore, ooniprobe takes no precautions to protect the install target machine
+Furthermore, ooniprobe takes no precautions to protect the install target machine
 from forensics analysis.  If the fact that you have installed or used ooni
 probe is a liability for you, please be aware of this risk.
 
diff --git a/Vagrantfile b/Vagrantfile
index 4f9bc9b..16a6ba0 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -30,7 +30,7 @@ apt-get install -y tor deb.torproject.org-keyring
 apt-get install -y build-essential libdumbnet-dev python-dumbnet python-pypcap libpcap-dev python-dev python-pip libgeoip-dev libffi-dev
 cd /ooni
 python setup.py install
-echo "Login using 'vagrant ssh', and dont forget to run ooniprobe as root."
+echo "Login using 'vagrant ssh', and don't forget to run ooniprobe as root."
 echo "First run: 'sudo ooniprobe -i /usr/share/ooni/decks/fast.deck'"
 
 SCRIPT
diff --git a/data/ooniprobe.1 b/data/ooniprobe.1
index 69e738a..cf3f593 100644
--- a/data/ooniprobe.1
+++ b/data/ooniprobe.1
@@ -178,7 +178,7 @@ aware of the fact that you are running ooniprobe. This means that if running
 network measurement tests is something considered to be illegal in your country
 then you could be spotted.
 .sp
-Futhermore, ooniprobe takes no precautions to protect the install target machine
+Furthermore, ooniprobe takes no precautions to protect the install target machine
 from forensics analysis.  If the fact that you have installed or used ooni
 probe is a liability for you, please be aware of this risk.
 .SS Debian based systems
diff --git a/docs/source/index.rst b/docs/source/index.rst
index dd9da6f..10c7c8f 100644
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -49,7 +49,7 @@ aware of the fact that you are running ooniprobe. This means that if running
 network measurement tests is something considered to be illegal in your country
 then you could be spotted.
 
-Futhermore, ooniprobe takes no precautions to protect the install target machine
+Furthermore, ooniprobe takes no precautions to protect the install target machine
 from forensics analysis.  If the fact that you have installed or used ooni
 probe is a liability for you, please be aware of this risk.
 
diff --git a/ooni/geoip.py b/ooni/geoip.py
index 26367ff..0ab2475 100644
--- a/ooni/geoip.py
+++ b/ooni/geoip.py
@@ -206,7 +206,7 @@ class ProbeIP(object):
             self.resolveGeodata()
             defer.returnValue(self.address)
         except errors.InsufficientPrivileges:
-            log.debug("Cannot determine the probe IP address with a traceroute, becase of insufficient priviledges")
+            log.debug("Cannot determine the probe IP address with a traceroute, becase of insufficient privileges")
         except:
             log.msg("Unable to lookup the probe IP via traceroute")
 
diff --git a/ooni/nettests/experimental/bridge_reachability/echo.py b/ooni/nettests/experimental/bridge_reachability/echo.py
index e64a604..bd4b6a1 100644
--- a/ooni/nettests/experimental/bridge_reachability/echo.py
+++ b/ooni/nettests/experimental/bridge_reachability/echo.py
@@ -113,7 +113,7 @@ class EchoTest(nettest.NetTestCase):
         def process_response(echo_reply, dest):
             ans, unans = echo_reply
             if ans:
-                log.msg("Recieved echo reply from %s: %s" % (dest, ans))
+                log.msg("Received echo reply from %s: %s" % (dest, ans))
             else:
                 log.msg("No reply was received from %s. Possible censorship event." % dest)
                 log.debug("Unanswered packets: %s" % unans)
diff --git a/ooni/nettests/manipulation/dns_spoof.py b/ooni/nettests/manipulation/dns_spoof.py
index a73ad6e..20dbd66 100644
--- a/ooni/nettests/manipulation/dns_spoof.py
+++ b/ooni/nettests/manipulation/dns_spoof.py
@@ -48,7 +48,7 @@ class DNSSpoof(scapyt.ScapyTest):
     def postProcessor(self, measurements):
         """
         This is not tested, but the concept is that if the two responses
-        match up then spoofing is occuring.
+        match up then spoofing is occurring.
         """
         try:
             test_answer = self.report['answered_packets'][0][UDP]
diff --git a/ooni/nettests/scanning/http_url_list.py b/ooni/nettests/scanning/http_url_list.py
index f89def4..e3a4957 100644
--- a/ooni/nettests/scanning/http_url_list.py
+++ b/ooni/nettests/scanning/http_url_list.py
@@ -58,7 +58,7 @@ class HTTPURLList(httpt.HTTPTest):
         censorship_page = open(self.localOptions['content']).xreadlines()
         response_page = iter(body.split("\n"))
 
-        # We first allign the two pages to the first HTML tag (something
+        # We first align the two pages to the first HTML tag (something
         # starting with <). This is useful so that we can give as input to this
         # test something that comes from the output of curl -kis
         # http://the_page/
diff --git a/ooni/tests/test_settings.py b/ooni/tests/test_settings.py
index 1d36b83..6b7c3b9 100644
--- a/ooni/tests/test_settings.py
+++ b/ooni/tests/test_settings.py
@@ -83,9 +83,9 @@ class TestSettings(ConfigTestCase):
         conditions that make it not possible to run it on travis.
         The tests need to be run as root on travis so that the ones that use
         scapy will work properly. When running tor as root, though, it will by
-        default drop priviledges to a lesser priviledged user (on debian based
+        default drop privileges to a lesser priviledged user (on debian based
         systems debian-tor). The problem is that the datadir will have already
-        been created with the priviledges of root, hence it will fail to use it
+        been created with the privileges of root, hence it will fail to use it
         as a datadir and fail.
         txtorcon addressed this issue in https://github.com/meejah/txtorcon/issues/26
         by chmodding the datadir with what is set as User.
diff --git a/ooni/utils/txscapy.py b/ooni/utils/txscapy.py
index 59ac5b1..27b68bd 100644
--- a/ooni/utils/txscapy.py
+++ b/ooni/utils/txscapy.py
@@ -401,7 +401,7 @@ class MPTraceroute(ScapyProtocol):
             """
             Add a packet into the received packets dictionary,
             typically the key is a tuple of packet fields used
-            to correlate sent packets with recieved packets.
+            to correlate sent packets with received packets.
             """
 
             # Initialize or append to the lists of packets
diff --git a/setup.py b/setup.py
index f21ab83..9b874f3 100644
--- a/setup.py
+++ b/setup.py
@@ -29,7 +29,7 @@ aware of the fact that you are running ooniprobe. This means that if running
 network measurement tests is something considered to be illegal in your country
 then you could be spotted.
 
-Futhermore, ooniprobe takes no precautions to protect the install target machine
+Furthermore, ooniprobe takes no precautions to protect the install target machine
 from forensics analysis. If the fact that you have installed or used ooni
 probe is a liability for you, please be aware of this risk.
 
diff --git a/var/old_notes.txt b/var/old_notes.txt
index 81d834f..4303a4c 100644
--- a/var/old_notes.txt
+++ b/var/old_notes.txt
@@ -9,7 +9,7 @@ We should act as a controller with TorCtl to do this, etc
 We should take the Tor consensus file and pass it to plugins such as marco
 
 HTTP Host header comparsion of a vs b
-HTTP Content length header comparision of a vs b
+HTTP Content length header comparison of a vs b
 
 GET request splitting
   "G E T "
diff --git a/var/proxooni-spec.txt b/var/proxooni-spec.txt
index 7cc476f..7a561d4 100644
--- a/var/proxooni-spec.txt
+++ b/var/proxooni-spec.txt
@@ -36,7 +36,7 @@
 
  ooni-proxy should provide open access by default with no authentication.
  It should support TLS-PSK[0] if authentication is desired. Key distribution is
- explictly an out of scope problem.
+ explicitly an out of scope problem.
 
 3.0 Services offered
 





More information about the tor-commits mailing list