September 2012 - tor-commits - lists.torproject.org

[compass/master] Set 'fast exit' constraints as default for FastExitFilter
by karsten＠torproject.org 10 Sep '12

10 Sep '12

commit e3b67fd549bac7fbe70e992ed05e721e732684f9 Author: delber <delber(a)riseup.net> Date: Sun Sep 9 14:07:11 2012 +0000 Set 'fast exit' constraints as default for FastExitFilter --- compass.py | 18 ++++++------------ 1 files changed, 6 insertions(+), 12 deletions(-) diff --git a/compass.py b/compass.py index 0bd823f..c3bb629 100755 --- a/compass.py +++ b/compass.py @@ -95,7 +95,9 @@ class FastExitFilter(BaseFilter): self.fp = relay.get('fingerprint') self.relay = relay - def __init__(self, bandwidth_rate, advertised_bandwidth, ports): + def __init__(self, bandwidth_rate=FAST_EXIT_BANDWIDTH_RATE, + advertised_bandwidth=FAST_EXIT_ADVERTISED_BANDWIDTH, + ports=FAST_EXIT_PORTS): self.bandwidth_rate = bandwidth_rate self.advertised_bandwidth = advertised_bandwidth self.ports = ports @@ -220,23 +222,15 @@ class RelayStats(object): if options.guards_only: filters.append(GuardFilter()) if options.fast_exits_only: - filters.append( - SameNetworkFilter( - FastExitFilter(FAST_EXIT_BANDWIDTH_RATE, FAST_EXIT_ADVERTISED_BANDWIDTH, - FAST_EXIT_PORTS))) + filters.append(SameNetworkFilter(FastExitFilter())) if options.almost_fast_exits_only: filters.append( FastExitFilter(ALMOST_FAST_EXIT_BANDWIDTH_RATE, ALMOST_FAST_EXIT_ADVERTISED_BANDWIDTH, ALMOST_FAST_EXIT_PORTS)) filters.append( - InverseFilter( - SameNetworkFilter( - FastExitFilter(FAST_EXIT_BANDWIDTH_RATE, FAST_EXIT_ADVERTISED_BANDWIDTH, - FAST_EXIT_PORTS)))) + InverseFilter(SameNetworkFilter(FastExitFilter()))) if options.fast_exits_only_any_network: - filters.append( - FastExitFilter(FAST_EXIT_BANDWIDTH_RATE, FAST_EXIT_ADVERTISED_BANDWIDTH, - FAST_EXIT_PORTS)) + filters.append(FastExitFilter()) return filters def _get_group_function(self, options):

1 0

[compass/master] Use identifiers when manipulating weights instead of anonymous tuples
by karsten＠torproject.org 10 Sep '12

10 Sep '12

commit 9e2da37e5c3e932c782c4d2fb3efc26eee2feb43 Author: delber <delber(a)riseup.net> Date: Sun Sep 9 15:05:50 2012 +0000 Use identifiers when manipulating weights instead of anonymous tuples --- compass.py | 53 +++++++++++++++++++++++++++++------------------------ 1 files changed, 29 insertions(+), 24 deletions(-) diff --git a/compass.py b/compass.py index c3bb629..a62eb98 100755 --- a/compass.py +++ b/compass.py @@ -249,19 +249,17 @@ class RelayStats(object): self._relays[key] = [] self._relays[key].append(relay) + WEIGHTS = ['consensus_weight_fraction', 'advertised_bandwidth_fraction', 'guard_probability', 'middle_probability', 'exit_probability'] + def format_and_sort_groups(self, grouped_relays, country=None, ases=None, by_country=False, by_as_number=False, links=False): formatted_groups = {} for group in grouped_relays.values(): - group_weights = (0, 0, 0, 0, 0) + group_weights = dict.fromkeys(RelayStats.WEIGHTS, 0) relays_in_group, exits_in_group, guards_in_group = 0, 0, 0 ases_in_group = set() for relay in group: - weights = (relay.get('consensus_weight_fraction', 0), - relay.get('advertised_bandwidth_fraction', 0), - relay.get('guard_probability', 0), - relay.get('middle_probability', 0), - relay.get('exit_probability', 0)) - group_weights = tuple(sum(x) for x in zip(group_weights, weights)) + for weight in RelayStats.WEIGHTS: + group_weights[weight] += relay.get(weight, 0) nickname = relay['nickname'] fingerprint = relay['fingerprint'] if not links else "https://atlas.torproject.org/#details/%s" % relay['fingerprint'] if 'Exit' in set(relay['flags']) and not 'BadExit' in set(relay['flags']): @@ -294,15 +292,15 @@ class RelayStats(object): else: format_string = "%8.4f%% %8.4f%% %8.4f%% %8.4f%% %8.4f%% %-19s %-40s %-5s %-5s %-2s %-9s" formatted_group = format_string % ( - group_weights[0] * 100.0, - group_weights[1] * 100.0, - group_weights[2] * 100.0, - group_weights[3] * 100.0, - group_weights[4] * 100.0, + group_weights['consensus_weight_fraction'] * 100.0, + group_weights['advertised_bandwidth_fraction'] * 100.0, + group_weights['guard_probability'] * 100.0, + group_weights['middle_probability'] * 100.0, + group_weights['exit_probability'] * 100.0, nickname, fingerprint, exit, guard, country, as_info) formatted_groups[formatted_group] = group_weights - sorted_groups = sorted(formatted_groups.iteritems(), key=operator.itemgetter(1)) + sorted_groups = sorted(formatted_groups.iteritems(), key=lambda gs: gs[1]['consensus_weight_fraction']) sorted_groups.reverse() return sorted_groups @@ -324,21 +322,28 @@ class RelayStats(object): type = "ASes" else: type = "relays" - other_weights = (0, 0, 0, 0, 0) + other_weights = dict.fromkeys(RelayStats.WEIGHTS, 0) for _, weights in sorted_groups[count:]: - other_weights = tuple(sum(x) for x in zip(other_weights, weights)) + for weight in RelayStats.WEIGHTS: + other_weights[weight] += weights[weight] output_string.append("%8.4f%% %8.4f%% %8.4f%% %8.4f%% %8.4f%% (%d other %s)" % ( - other_weights[0] * 100.0, other_weights[1] * 100.0, - other_weights[2] * 100.0, other_weights[3] * 100.0, - other_weights[4] * 100.0, len(sorted_groups) - count, type)) - selection_weights = (0, 0, 0, 0, 0) + other_weights['consensus_weight_fraction'] * 100.0, + other_weights['advertised_bandwidth_fraction'] * 100.0, + other_weights['guard_probability'] * 100.0, + other_weights['middle_probability'] * 100.0, + other_weights['exit_probability'] * 100.0, + len(sorted_groups) - count, type)) + selection_weights = dict.fromkeys(RelayStats.WEIGHTS, 0) for _, weights in sorted_groups: - selection_weights = tuple(sum(x) for x in zip(selection_weights, weights)) - if len(sorted_groups) > 1 and selection_weights[0] < 0.999: + for weight in RelayStats.WEIGHTS: + selection_weights[weight] += weights[weight] + if len(sorted_groups) > 1 and selection_weights['consensus_weight_fraction'] < 0.999: output_string.append("%8.4f%% %8.4f%% %8.4f%% %8.4f%% %8.4f%% (total in selection)" % ( - selection_weights[0] * 100.0, selection_weights[1] * 100.0, - selection_weights[2] * 100.0, selection_weights[3] * 100.0, - selection_weights[4] * 100.0)) + selection_weights['consensus_weight_fraction'] * 100.0, + selection_weights['advertised_bandwidth_fraction'] * 100.0, + selection_weights['guard_probability'] * 100.0, + selection_weights['middle_probability'] * 100.0, + selection_weights['exit_probability'] * 100.0)) return output_string def create_option_parser():

1 0

[compass/master] Re-introduce a separate filter for same network limits
by karsten＠torproject.org 10 Sep '12

10 Sep '12

commit dd78cd9b7858a5d9016e3831b6606ac0879e27a4 Author: delber <delber(a)riseup.net> Date: Sun Sep 9 14:02:47 2012 +0000 Re-introduce a separate filter for same network limits --- compass.py | 96 ++++++++++++++++++++++++++++++++---------------------------- 1 files changed, 51 insertions(+), 45 deletions(-) diff --git a/compass.py b/compass.py index e79b71e..0bd823f 100755 --- a/compass.py +++ b/compass.py @@ -9,6 +9,7 @@ FAST_EXIT_BANDWIDTH_RATE = 95 * 125 * 1024 # 95 Mbit/s FAST_EXIT_ADVERTISED_BANDWIDTH = 5000 * 1024 # 5000 kB/s FAST_EXIT_PORTS = [80, 443, 554, 1755] +FAST_EXIT_MAX_PER_NETWORK = 2 ALMOST_FAST_EXIT_BANDWIDTH_RATE = 80 * 125 * 1024 # 80 Mbit/s ALMOST_FAST_EXIT_ADVERTISED_BANDWIDTH = 2000 * 1024 # 2000 kB/s @@ -21,6 +22,7 @@ import os from optparse import OptionParser, OptionGroup import urllib import re +import itertools class BaseFilter(object): def accept(self, relay): @@ -93,11 +95,10 @@ class FastExitFilter(BaseFilter): self.fp = relay.get('fingerprint') self.relay = relay - def __init__(self, bandwidth_rate, advertised_bandwidth, ports, same_network): + def __init__(self, bandwidth_rate, advertised_bandwidth, ports): self.bandwidth_rate = bandwidth_rate self.advertised_bandwidth = advertised_bandwidth self.ports = ports - self.same_network = same_network def load(self, all_relays): # First, filter relays based on bandwidth and port requirements. @@ -128,43 +129,45 @@ class FastExitFilter(BaseFilter): if 'reject' in summary and not relevant_ports.isdisjoint(policy_ports): continue matching_relays.append(relay) - # Second, filter relays based on same /24 requirement. - if self.same_network: - network_data = {} - for relay in matching_relays: - or_addresses = relay.get("or_addresses") - no_of_addresses = 0 - for ip in or_addresses: - ip, port = ip.rsplit(':', 1) - # skip if ipv6 - if ':' in ip: - continue - no_of_addresses += 1 - if no_of_addresses > 1: - print "[WARNING] - %s has more than one IPv4 OR address - %s" % relay.get("fingerprint"), or_addresses - network = ip.rsplit('.', 1)[0] - relay_info = self.Relay(relay) - if network_data.has_key(network): - if len(network_data[network]) > 1: - # assume current relay to have smallest exit_probability - min_exit = relay.get('exit_probability') - min_id = -1 - for id, value in enumerate(network_data[network]): - if value.exit < min_exit: - min_exit = value.exit - min_id = id - if min_id != -1: - del network_data[network][min_id] - network_data[network].append(relay_info) - else: - network_data[network].append(relay_info) - else: - network_data[network] = [relay_info] - matching_relays = [] - for relay_list in network_data.values(): - matching_relays.extend([relay.relay for relay in relay_list]) return matching_relays +class SameNetworkFilter(BaseFilter): + def __init__(self, orig_filter, max_per_network=FAST_EXIT_MAX_PER_NETWORK): + self.orig_filter = orig_filter + self.max_per_network = max_per_network + + def load(self, all_relays): + network_data = {} + for relay in self.orig_filter.load(all_relays): + or_addresses = relay.get("or_addresses") + no_of_addresses = 0 + for ip in or_addresses: + ip, port = ip.rsplit(':', 1) + # skip if ipv6 + if ':' in ip: + continue + no_of_addresses += 1 + if no_of_addresses > 1: + print "[WARNING] - %s has more than one IPv4 OR address - %s" % relay.get("fingerprint"), or_addresses + network = ip.rsplit('.', 1)[0] + if network_data.has_key(network): + if len(network_data[network]) >= FAST_EXIT_MAX_PER_NETWORK: + # assume current relay to have smallest exit_probability + min_exit = relay.get('exit_probability') + min_id = -1 + for id, value in enumerate(network_data[network]): + if value.get('exit_probability') < min_exit: + min_exit = value.get('exit_probability') + min_id = id + if min_id != -1: + del network_data[network][min_id] + network_data[network].append(relay) + else: + network_data[network].append(relay) + else: + network_data[network] = [relay] + return list(itertools.chain.from_iterable(network_data.values())) + class InverseFilter(BaseFilter): def __init__(self, orig_filter): self.orig_filter = orig_filter @@ -218,20 +221,22 @@ class RelayStats(object): filters.append(GuardFilter()) if options.fast_exits_only: filters.append( - FastExitFilter(FAST_EXIT_BANDWIDTH_RATE, FAST_EXIT_ADVERTISED_BANDWIDTH, - FAST_EXIT_PORTS, same_network=True)) + SameNetworkFilter( + FastExitFilter(FAST_EXIT_BANDWIDTH_RATE, FAST_EXIT_ADVERTISED_BANDWIDTH, + FAST_EXIT_PORTS))) if options.almost_fast_exits_only: filters.append( FastExitFilter(ALMOST_FAST_EXIT_BANDWIDTH_RATE, ALMOST_FAST_EXIT_ADVERTISED_BANDWIDTH, - ALMOST_FAST_EXIT_PORTS, same_network=False)) + ALMOST_FAST_EXIT_PORTS)) filters.append( InverseFilter( - FastExitFilter(FAST_EXIT_BANDWIDTH_RATE, FAST_EXIT_ADVERTISED_BANDWIDTH, - FAST_EXIT_PORTS, same_network=True))) + SameNetworkFilter( + FastExitFilter(FAST_EXIT_BANDWIDTH_RATE, FAST_EXIT_ADVERTISED_BANDWIDTH, + FAST_EXIT_PORTS)))) if options.fast_exits_only_any_network: filters.append( FastExitFilter(FAST_EXIT_BANDWIDTH_RATE, FAST_EXIT_ADVERTISED_BANDWIDTH, - FAST_EXIT_PORTS, same_network=False)) + FAST_EXIT_PORTS)) return filters def _get_group_function(self, options): @@ -361,10 +366,11 @@ def create_option_parser(): group.add_option("-g", "--guards-only", action="store_true", help="select only relays suitable for guard position") group.add_option("--fast-exits-only", action="store_true", - help="select only fast exits (%d+ Mbit/s, %d+ KB/s, %s, 2- per /24)" % + help="select only fast exits (%d+ Mbit/s, %d+ KB/s, %s, %d- per /24)" % (FAST_EXIT_BANDWIDTH_RATE / (125 * 1024), FAST_EXIT_ADVERTISED_BANDWIDTH / 1024, - '/'.join(map(str, FAST_EXIT_PORTS)))) + '/'.join(map(str, FAST_EXIT_PORTS)), + FAST_EXIT_MAX_PER_NETWORK)) group.add_option("--almost-fast-exits-only", action="store_true", help="select only almost fast exits (%d+ Mbit/s, %d+ KB/s, %s, not in set of fast exits)" % (ALMOST_FAST_EXIT_BANDWIDTH_RATE / (125 * 1024),

1 0

[compass/master] Rewrap some very long lines
by karsten＠torproject.org 10 Sep '12

10 Sep '12

commit 2a9b8c468575d6c3facc4caf41451a2a44944c62 Author: delber <delber(a)riseup.net> Date: Sun Sep 9 13:42:03 2012 +0000 Rewrap some very long lines --- compass.py | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) diff --git a/compass.py b/compass.py index 7afcd62..e79b71e 100755 --- a/compass.py +++ b/compass.py @@ -217,12 +217,21 @@ class RelayStats(object): if options.guards_only: filters.append(GuardFilter()) if options.fast_exits_only: - filters.append(FastExitFilter(FAST_EXIT_BANDWIDTH_RATE, FAST_EXIT_ADVERTISED_BANDWIDTH, FAST_EXIT_PORTS, same_network=True)) + filters.append( + FastExitFilter(FAST_EXIT_BANDWIDTH_RATE, FAST_EXIT_ADVERTISED_BANDWIDTH, + FAST_EXIT_PORTS, same_network=True)) if options.almost_fast_exits_only: - filters.append(FastExitFilter(ALMOST_FAST_EXIT_BANDWIDTH_RATE, ALMOST_FAST_EXIT_ADVERTISED_BANDWIDTH, ALMOST_FAST_EXIT_PORTS, same_network=False)) - filters.append(InverseFilter(FastExitFilter(FAST_EXIT_BANDWIDTH_RATE, FAST_EXIT_ADVERTISED_BANDWIDTH, FAST_EXIT_PORTS, same_network=True))) + filters.append( + FastExitFilter(ALMOST_FAST_EXIT_BANDWIDTH_RATE, ALMOST_FAST_EXIT_ADVERTISED_BANDWIDTH, + ALMOST_FAST_EXIT_PORTS, same_network=False)) + filters.append( + InverseFilter( + FastExitFilter(FAST_EXIT_BANDWIDTH_RATE, FAST_EXIT_ADVERTISED_BANDWIDTH, + FAST_EXIT_PORTS, same_network=True))) if options.fast_exits_only_any_network: - filters.append(FastExitFilter(FAST_EXIT_BANDWIDTH_RATE, FAST_EXIT_ADVERTISED_BANDWIDTH, FAST_EXIT_PORTS, same_network=False)) + filters.append( + FastExitFilter(FAST_EXIT_BANDWIDTH_RATE, FAST_EXIT_ADVERTISED_BANDWIDTH, + FAST_EXIT_PORTS, same_network=False)) return filters def _get_group_function(self, options):

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 10 Sep '12

10 Sep '12

commit cb49ff632a8a91a5b904f7116d22838cccf23fb2 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Sep 10 06:45:31 2012 +0000 Update translations for https_everywhere --- si_LK/https-everywhere.dtd | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/si_LK/https-everywhere.dtd b/si_LK/https-everywhere.dtd new file mode 100644 index 0000000..15bce37 --- /dev/null +++ b/si_LK/https-everywhere.dtd @@ -0,0 +1,37 @@ +<!ENTITY https-everywhere.about.title "HTTPS Everywhere පිලිබඳව"> +<!ENTITY https-everywhere.about.ext_name "HTTPS Everywhere"> +<!ENTITY https-everywhere.about.ext_description "බොහෝ වෙබ් අඩවි සඳහා HTTPS ආරක්ෂාව ස්වයංක්‍රීයව පාවිච්චි කරන්න."> +<!ENTITY https-everywhere.about.version "සංස්කරණය"> +<!ENTITY https-everywhere.about.created_by "නිර්මිත"> +<!ENTITY https-everywhere.about.librarians ""> +<!ENTITY https-everywhere.about.thanks "ස්තුතිය"> +<!ENTITY https-everywhere.about.contribute "HTTPS Everywhere පිලිබඳව ඔබ කැමතිනම් මේවා සලකා බැලිය යුතුය"> +<!ENTITY https-everywhere.about.donate_tor "Tor වලට ආධාර කරන්න"> +<!ENTITY https-everywhere.about.tor_lang_code "ඉංග්‍රීසි"> +<!ENTITY https-everywhere.about.donate_eff " EFF වලට ආධාර කරන්න"> + +<!ENTITY https-everywhere.menu.about "HTTPS Everywhere පිලිබඳව"> +<!ENTITY https-everywhere.menu.observatory ""> +<!ENTITY https-everywhere.menu.globalEnable ""> +<!ENTITY https-everywhere.menu.globalDisable ""> + +<!ENTITY https-everywhere.prefs.title ""> +<!ENTITY https-everywhere.prefs.enable_all ""> +<!ENTITY https-everywhere.prefs.disable_all ""> +<!ENTITY https-everywhere.prefs.reset_defaults ""> +<!ENTITY https-everywhere.prefs.search ""> +<!ENTITY https-everywhere.prefs.site ""> +<!ENTITY https-everywhere.prefs.notes ""> +<!ENTITY https-everywhere.prefs.list_caption ""> +<!ENTITY https-everywhere.prefs.enabled ""> +<!ENTITY https-everywhere.prefs.ruleset_howto ""> +<!ENTITY https-everywhere.prefs.here_link ""> +<!ENTITY https-everywhere.prefs.toggle ""> +<!ENTITY https-everywhere.prefs.reset_default ""> +<!ENTITY https-everywhere.prefs.view_xml_source ""> + +<!ENTITY https-everywhere.source.downloading ""> +<!ENTITY https-everywhere.source.filename ""> +<!ENTITY https-everywhere.source.unable_to_download ""> + +

1 0

[torspec/master] specify what absence of a consensus-methods line means
by arma＠torproject.org 09 Sep '12

09 Sep '12

commit b829224cb993c0eee3ffb14cf4c58a831f11fd39 Author: Roger Dingledine <arma(a)torproject.org> Date: Sun Sep 9 18:03:41 2012 -0400 specify what absence of a consensus-methods line means --- dir-spec.txt | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dir-spec.txt b/dir-spec.txt index 3f88eba..6c17f2c 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -1145,8 +1145,9 @@ [At most once for votes; does not occur in consensuses.] A space-separated list of supported methods for generating - consensuses from votes. See section 3.5.1 for details. Method "1" - MUST be included. + consensuses from votes. See section 3.5.1 for details. If this + line is present, method "1" MUST be included. Absence of the + line means that only method "1" is supported. "consensus-method" SP Integer NL

1 0

[compass/master] Add new compass logo
by karsten＠torproject.org 09 Sep '12

09 Sep '12

commit b22497f234ca2dd513ea25557432897f98bdb5bb Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Sun Sep 9 20:16:22 2012 +0530 Add new compass logo Thanks to kousik, we have a new logo for compass. --- static/img/compass-logo.jpg | Bin 0 -> 3938 bytes templates/index.html | 4 ++-- templates/result.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/static/img/compass-logo.jpg b/static/img/compass-logo.jpg new file mode 100644 index 0000000..e9d0f60 Binary files /dev/null and b/static/img/compass-logo.jpg differ diff --git a/templates/index.html b/templates/index.html index 3fd3597..e51f6d0 100644 --- a/templates/index.html +++ b/templates/index.html @@ -33,7 +33,7 @@ <span class="icon-bar"></span> </a> <a class="brand" href="{{ - url_for('index') }}">Tor Metrics</a> + url_for('index') }}"><img src="{{ url_for('static', filename='img/compass-logo.jpg') }}" /></a> <div class="nav-collapse"> <ul class="nav"> <li class="active"><a href="{{ @@ -51,7 +51,7 @@ <form class="form-horizontal" action="{{ url_for('result') }}" method=get id="form"> <fieldset> - <legend>Tor Relay Stats</legend> + <legend>Compass</legend> <div class="control-group"> <h3> Filter </h3> <label class="control-label" for="inactive">Inactive</label> diff --git a/templates/result.html b/templates/result.html index 28d4f21..28211e7 100644 --- a/templates/result.html +++ b/templates/result.html @@ -34,7 +34,7 @@ <span class="icon-bar"></span> </a> <a class="brand" href="{{ - url_for('index') }}">Tor Metrics</a> + url_for('index') }}"><img src="{{ url_for('static', filename='img/compass-logo.jpg') }}"></a> <div class="nav-collapse"> <ul class="nav"> <li class="active"><a href="{{

1 0

[compass/master] Merge remote-tracking branch 'gsathya/bug_6639'
by karsten＠torproject.org 09 Sep '12

09 Sep '12

commit ee57adb1bd2c31a13b61cbfc5e371d965b866150 Merge: 6a2de26 b22497f Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sun Sep 9 17:37:43 2012 -0400 Merge remote-tracking branch 'gsathya/bug_6639' Conflicts: templates/result.html static/img/compass-logo.jpg | Bin 0 -> 3938 bytes templates/index.html | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --cc templates/index.html index 85fd634,e51f6d0..65a5c6a --- a/templates/index.html +++ b/templates/index.html @@@ -48,10 -48,10 +48,10 @@@ <div class="container"> <div class="hero-unit"> - <form class="form-horizontal" action="{{ url_for('result') }}" + <form class="form-horizontal" action="" method=get id="form"> <fieldset> - <legend>Tor Relay Stats</legend> + <legend>Compass</legend> <div class="control-group"> <h3> Filter </h3> <label class="control-label" for="inactive">Inactive</label>

1 0

[compass/master] Remove abstractions
by karsten＠torproject.org 09 Sep '12

09 Sep '12

commit 1623a83ecc078f3848dc73f6665cefc104975fee Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Sun Sep 9 20:00:01 2012 +0530 Remove abstractions We really don't need abstractions in a dynamically typed language. That said, it'd be nice to throw an error when someone doesn't implement "accept()". --- compass.py | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/compass.py b/compass.py index 428812f..8b00bf6 100755 --- a/compass.py +++ b/compass.py @@ -13,12 +13,10 @@ import os from optparse import OptionParser, OptionGroup import urllib import re -from abc import abstractmethod class BaseFilter(object): - @abstractmethod def accept(self, relay): - pass + raise NotImplementedError("This isn't implemented by the subclass") def load(self, relays): return filter(self.accept, relays)

1 0

[compass/master] Merge remote-tracking branch 'gsathya/bug_6691'
by karsten＠torproject.org 09 Sep '12

09 Sep '12

commit 6a2de26330920f2c87728ae5c1c63a044d2838c5 Merge: 6238c95 1623a83 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sun Sep 9 17:10:05 2012 -0400 Merge remote-tracking branch 'gsathya/bug_6691' compass.py | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-)

1 0