tor-commits June 2011

tor-commits@lists.torproject.org

14 participants
716 discussions

[arm/master] fix: inconsistent capitalization for summaries
by atagar＠torproject.org 19 Jun '11

19 Jun '11

commit b2cb195bac58a1251d88238622447832557cedc0 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jun 18 18:35:45 2011 -0700 fix: inconsistent capitalization for summaries Summaries for most config sections were capitalized, but the last ones weren't. Changing it so they're all capitalized. --- src/settings.cfg | 88 +++++++++++++++++++++++++++--------------------------- 1 files changed, 44 insertions(+), 44 deletions(-) diff --git a/src/settings.cfg b/src/settings.cfg index 5e62ce1..7a1d63f 100644 --- a/src/settings.cfg +++ b/src/settings.cfg @@ -186,61 +186,61 @@ config.summary.ConnDirectionStatistics Toggles storing connection use to disk config.summary.ExtraInfoStatistics Publishes statistic data in the extra-info documents # Directory Server Options -config.summary.AuthoritativeDirectory act as a directory authority -config.summary.DirPortFrontPage publish this html file on the DirPort -config.summary.V1AuthoritativeDirectory generates a version 1 consensus -config.summary.V2AuthoritativeDirectory generates a version 2 consensus -config.summary.V3AuthoritativeDirectory generates a version 3 consensus -config.summary.VersioningAuthoritativeDirectory provides opinions on recommended versions of tor -config.summary.NamingAuthoritativeDirectory provides opinions on fingerprint to nickname bindings -config.summary.HSAuthoritativeDir toggles accepting hidden service descriptors -config.summary.HidServDirectoryV2 toggles accepting version 2 hidden service descriptors -config.summary.BridgeAuthoritativeDir acts as a bridge authority -config.summary.MinUptimeHidServDirectoryV2 required uptime before accepting hidden service directory -config.summary.DirPort port for directory connections -config.summary.DirListenAddress address the directory service is bound to -config.summary.DirPolicy access policy for the DirPort +config.summary.AuthoritativeDirectory Act as a directory authority +config.summary.DirPortFrontPage Publish this html file on the DirPort +config.summary.V1AuthoritativeDirectory Generates a version 1 consensus +config.summary.V2AuthoritativeDirectory Generates a version 2 consensus +config.summary.V3AuthoritativeDirectory Generates a version 3 consensus +config.summary.VersioningAuthoritativeDirectory Provides opinions on recommended versions of tor +config.summary.NamingAuthoritativeDirectory Provides opinions on fingerprint to nickname bindings +config.summary.HSAuthoritativeDir Toggles accepting hidden service descriptors +config.summary.HidServDirectoryV2 Toggles accepting version 2 hidden service descriptors +config.summary.BridgeAuthoritativeDir Acts as a bridge authority +config.summary.MinUptimeHidServDirectoryV2 Required uptime before accepting hidden service directory +config.summary.DirPort Port for directory connections +config.summary.DirListenAddress Address the directory service is bound to +config.summary.DirPolicy Access policy for the DirPort config.summary.FetchV2Networkstatus Get the obsolete V2 consensus # Directory Authority Server Options -config.summary.RecommendedVersions tor versions believed to be safe -config.summary.RecommendedClientVersions tor versions believed to be safe for clients -config.summary.RecommendedServerVersions tor versions believed to be safe for relays -config.summary.ConsensusParams params entry of the networkstatus vote -config.summary.DirAllowPrivateAddresses toggles allowing arbitrary input or non-public IPs in descriptors -config.summary.AuthDirBadDir relays to be flagged as bad directory caches -config.summary.AuthDirBadExit relays to be flagged as bad exits -config.summary.AuthDirInvalid relays from which the valid flag is withheld -config.summary.AuthDirReject relays to be dropped from the consensus -config.summary.AuthDirListBadDirs toggles if we provide an opinion on bad directory caches -config.summary.AuthDirListBadExits toggles if we provide an opinion on bad exits -config.summary.AuthDirRejectUnlisted rejects further relay descriptors -config.summary.AuthDirMaxServersPerAddr limit on the number of relays accepted per ip -config.summary.AuthDirMaxServersPerAuthAddr limit on the number of relays accepted per an authority's ip +config.summary.RecommendedVersions Tor versions believed to be safe +config.summary.RecommendedClientVersions Tor versions believed to be safe for clients +config.summary.RecommendedServerVersions Tor versions believed to be safe for relays +config.summary.ConsensusParams Params entry of the networkstatus vote +config.summary.DirAllowPrivateAddresses Toggles allowing arbitrary input or non-public IPs in descriptors +config.summary.AuthDirBadDir Relays to be flagged as bad directory caches +config.summary.AuthDirBadExit Relays to be flagged as bad exits +config.summary.AuthDirInvalid Relays from which the valid flag is withheld +config.summary.AuthDirReject Relays to be dropped from the consensus +config.summary.AuthDirListBadDirs Toggles if we provide an opinion on bad directory caches +config.summary.AuthDirListBadExits Toggles if we provide an opinion on bad exits +config.summary.AuthDirRejectUnlisted Rejects further relay descriptors +config.summary.AuthDirMaxServersPerAddr Limit on the number of relays accepted per ip +config.summary.AuthDirMaxServersPerAuthAddr Limit on the number of relays accepted per an authority's ip config.summary.BridgePassword Password for requesting bridge information -config.summary.V3AuthVotingInterval consensus voting interval -config.summary.V3AuthVoteDelay wait time to collect votes of other authorities -config.summary.V3AuthDistDelay wait time to collect the signatures of other authorities -config.summary.V3AuthNIntervalsValid number of voting intervals a consensus is valid for -config.summary.V3BandwidthsFile path to a file containing measured relay bandwidths +config.summary.V3AuthVotingInterval Consensus voting interval +config.summary.V3AuthVoteDelay Wait time to collect votes of other authorities +config.summary.V3AuthDistDelay Wait time to collect the signatures of other authorities +config.summary.V3AuthNIntervalsValid Number of voting intervals a consensus is valid for +config.summary.V3BandwidthsFile Path to a file containing measured relay bandwidths config.summary.V3AuthUseLegacyKey Signs consensus with both the current and legacy keys config.summary.RephistTrackTime Discards old, unchanged reliability informaition # Hidden Service Options -config.summary.HiddenServiceDir directory contents for the hidden service -config.summary.HiddenServicePort port the hidden service is provided on -config.summary.PublishHidServDescriptors toggles automated publishing of the hidden service to the rendezvous directory +config.summary.HiddenServiceDir Directory contents for the hidden service +config.summary.HiddenServicePort Port the hidden service is provided on +config.summary.PublishHidServDescriptors Toggles automated publishing of the hidden service to the rendezvous directory config.summary.HiddenServiceVersion Version for published hidden service descriptors -config.summary.HiddenServiceAuthorizeClient restricts access to the hidden service -config.summary.RendPostPeriod period at which the rendezvous service descriptors are refreshed +config.summary.HiddenServiceAuthorizeClient Restricts access to the hidden service +config.summary.RendPostPeriod Period at which the rendezvous service descriptors are refreshed # Testing Network Options -config.summary.TestingTorNetwork overrides other options to be a testing network -config.summary.TestingV3AuthInitialVotingInterval overrides V3AuthVotingInterval for the first consensus -config.summary.TestingV3AuthInitialVoteDelay overrides TestingV3AuthInitialVoteDelay for the first consensus -config.summary.TestingV3AuthInitialDistDelay overrides TestingV3AuthInitialDistDelay for the first consensus -config.summary.TestingAuthDirTimeToLearnReachability delay until opinions are given about which relays are running or not -config.summary.TestingEstimatedDescriptorPropagationTime delay before clients attempt to fetch descriptors from directory caches +config.summary.TestingTorNetwork Overrides other options to be a testing network +config.summary.TestingV3AuthInitialVotingInterval Overrides V3AuthVotingInterval for the first consensus +config.summary.TestingV3AuthInitialVoteDelay Overrides TestingV3AuthInitialVoteDelay for the first consensus +config.summary.TestingV3AuthInitialDistDelay Overrides TestingV3AuthInitialDistDelay for the first consensus +config.summary.TestingAuthDirTimeToLearnReachability Delay until opinions are given about which relays are running or not +config.summary.TestingEstimatedDescriptorPropagationTime Delay before clients attempt to fetch descriptors from directory caches # Snippets from common log messages # These are static bits of log messages, used to determine when entries with

1 0

[arm/master] Flagging a couple important config options
by atagar＠torproject.org 19 Jun '11

19 Jun '11

commit 57af5cf4401cd502a7adaa4f6891e5a3b93aaa08 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jun 18 18:40:45 2011 -0700 Flagging a couple important config options Adding the important flag to MaxCircuitDirtiness and PortForwarding so they're displayed in the summarized config listing. --- src/settings.cfg | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/settings.cfg b/src/settings.cfg index 7a1d63f..bced9a4 100644 --- a/src/settings.cfg +++ b/src/settings.cfg @@ -10,20 +10,26 @@ config.important DataDirectory config.important Log config.important RunAsDaemon config.important User + config.important Bridge config.important ExcludeNodes +config.important MaxCircuitDirtiness config.important SocksPort config.important UseBridges + config.important BridgeRelay config.important ContactInfo config.important ExitPolicy config.important MyFamily config.important Nickname config.important ORPort +config.important PortForwarding config.important AccountingMax config.important AccountingStart + config.important DirPortFrontPage config.important DirPort + config.important HiddenServiceDir config.important HiddenServicePort

1 0

[arm/master] Dropping usage of TorCtl.connect()
by atagar＠torproject.org 19 Jun '11

19 Jun '11

commit 8d6a1a6b0bd14b10b6bbe468e55c382e2a0bb6d5 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jun 18 19:31:02 2011 -0700 Dropping usage of TorCtl.connect() Using a custom implementation of the TorCtl.connect() function rather than adding hacks for added functionality. This version provides a different password prompt message (suggestion by weasel) and expansion of relative cookie paths. This is mostly being done since the previous hack would attempt relative cookies, fail, print a failure message, then the hack would correct for this. Having a custom connect() means we can correct the path on the first pass. --- src/starter.py | 76 ++++++++++++++++++++++++++++++++++--------------------- 1 files changed, 47 insertions(+), 29 deletions(-) diff --git a/src/starter.py b/src/starter.py index e060274..d50c718 100644 --- a/src/starter.py +++ b/src/starter.py @@ -10,6 +10,7 @@ import os import sys import time import getopt +import getpass import locale import platform @@ -176,6 +177,49 @@ def _loadConfigurationDescriptions(pathPrefix): msg = DESC_INTERNAL_LOAD_FAILED_MSG % util.sysTools.getFileErrorMsg(exc) util.log.log(CONFIG["log.configDescriptions.internalLoadFailed"], msg) +def _torCtlConnect(controlAddr="127.0.0.1", controlPort=9051, passphrase=None, incorrectPasswordMsg=""): + """ + Custom handler for establishing a TorCtl connection. + """ + + conn = None + try: + conn, authType, authValue = TorCtl.TorCtl.preauth_connect(controlAddr, controlPort) + + if authType == TorCtl.TorCtl.AUTH_TYPE.PASSWORD: + # password authentication, promting for the password if it wasn't provided + if passphrase: authValue = passphrase + else: + try: authValue = getpass.getpass("Controller password: ") + except KeyboardInterrupt: return None + elif authType == TorCtl.TorCtl.AUTH_TYPE.COOKIE and authValue[0] != "/": + # Connecting to the control port will probably fail if it's using cookie + # authentication and the cookie path is relative (unfortunately this is + # the case for TBB). This is discussed in: + # https://trac.torproject.org/projects/tor/ticket/1101 + # + # This is best effort. If we can't expand the path then it's still + # attempted since we might be running in tor's pwd. + + torPid = util.torTools.getPid(controlPort) + if torPid: + try: conn._cookiePath = util.sysTools.expandRelativePath(authValue, torPid) + except IOError: pass + + conn.authenticate(authValue) + return conn + except Exception, exc: + if conn: conn.close() + + if passphrase and str(exc) == "Unable to authenticate: password incorrect": + # provide a warning that the provided password didn't work, then try + # again prompting for the user to enter it + print incorrectPasswordMsg + return _torCtlConnect(controlAddr, controlPort) + else: + print exc + return None + def _dumpConfig(): """ Dumps the current arm and tor configurations at the DEBUG runlevel. This @@ -341,36 +385,10 @@ if __name__ == '__main__': # sets up TorCtl connection, prompting for the passphrase if necessary and # sending problems to stdout if they arise - TorCtl.TorCtl.INCORRECT_PASSWORD_MSG = "Controller password found in '%s' was incorrect" % configPath authPassword = config.get("startup.controlPassword", CONFIG["startup.controlPassword"]) - conn = TorCtl.TorCtl.connect(controlAddr, controlPort, authPassword) - if conn == None: - # Connecting to the control port will probably fail if it's using cookie - # authentication and the cookie path is relative (unfortunately this is - # the case for TBB). This is discussed in: - # https://trac.torproject.org/projects/tor/ticket/1101 - # - # Until this is fixed including a hack to expand the relative path in - # these cases, setting conn to the established connection if successful - # and leaving it undefined otherwise. Even if successful this prints the - # error message saying that the auth cookie couldn't be found - # (unfortunately this is unavoidable without either changing TorCtl or - # making this a much bigger hack). - - try: - tmpConn, authType, cookiePath = TorCtl.TorCtl.preauth_connect(controlAddr, controlPort) - - if authType == TorCtl.TorCtl.AUTH_TYPE.COOKIE: - torPid = util.torTools.getPid(controlPort) - - if torPid and cookiePath[0] != "/": - # previous attempt to connect failed due to having a relative path - fix it - tmpConn._cookiePath = util.sysTools.expandRelativePath(cookiePath, torPid) - tmpConn.authenticate(cookiePath) - conn = tmpConn # success! - except: pass - - if conn == None: sys.exit(1) + incorrectPasswordMsg = "Password found in '%s' was incorrect" % configPath + conn = _torCtlConnect(controlAddr, controlPort, authPassword, incorrectPasswordMsg) + if conn == None: sys.exit(1) # removing references to the controller password so the memory can be freed # (unfortunately python does allow for direct access to the memory so this

1 0

r24824: {} svg versions of our logos. (projects/misc/phobos)
by Andrew Lewman 19 Jun '11

19 Jun '11

Author: phobos Date: 2011-06-19 02:28:58 +0000 (Sun, 19 Jun 2011) New Revision: 24824 Added: projects/misc/phobos/svg_logos.tar.gz Log: svg versions of our logos. Added: projects/misc/phobos/svg_logos.tar.gz =================================================================== (Binary files differ) Property changes on: projects/misc/phobos/svg_logos.tar.gz ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

1 0

[arm/packaging] Updating autofetch torctl bundle
by atagar＠torproject.org 18 Jun '11

18 Jun '11

commit 967db1a753a248c0cba8bb9795648df55bfe9c34 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jun 18 15:52:00 2011 -0700 Updating autofetch torctl bundle Using the torctl commit... af306b53a668168ae92a6c919d4013b81d7e61ad --- deps/fetch.sh | 1 + deps/torctl.tar.gz | Bin 64261 -> 64726 bytes 2 files changed, 1 insertions(+), 0 deletions(-) diff --git a/deps/fetch.sh b/deps/fetch.sh index 73d5505..baaa61b 100755 --- a/deps/fetch.sh +++ b/deps/fetch.sh @@ -3,6 +3,7 @@ # and provided with the tarball to avoid complicating the install process. # # TorCtl (https://gitweb.torproject.org/pytorctl.git) +# 6/18/11 - 5460adb1394c368ba492cc33d6681618b3d3062b3f5f70b2a87520fc291701c3 # 6/10/11 - be583e53b2bccf09a7126c5271f9af5682447903b6ac92cf1cf78ca5b35273ed # # cagraph (https://code.google.com/p/cagraph/) diff --git a/deps/torctl.tar.gz b/deps/torctl.tar.gz index d45820b..e079c45 100644 Binary files a/deps/torctl.tar.gz and b/deps/torctl.tar.gz differ

1 0

[arm/master] Autofetching new torctl bundle
by atagar＠torproject.org 18 Jun '11

18 Jun '11

commit a72d0de4404d8d3db52f236c2abb0d2e02c9ee2f Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jun 18 15:58:57 2011 -0700 Autofetching new torctl bundle --- src/prereq.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/prereq.py b/src/prereq.py index ba1e988..eee9fdb 100644 --- a/src/prereq.py +++ b/src/prereq.py @@ -12,9 +12,9 @@ import tempfile # Library dependencies can be fetched on request. By default this is via # the following mirrors with their sha256 signatures checked. -TORCTL_ARCHIVE = "http://www.atagar.com/arm/resources/deps/11-6-10/torctl.tar.gz" -TORCTL_SIG = "be583e53b2bccf09a7126c5271f9af5682447903b6ac92cf1cf78ca5b35273ed" -CAGRAPH_ARCHIVE = "http://www.atagar.com/arm/resources/deps/11-6-10/cagraph.tar.gz" +TORCTL_ARCHIVE = "http://www.atagar.com/arm/resources/deps/11-06-16/torctl.tar.gz" +TORCTL_SIG = "5460adb1394c368ba492cc33d6681618b3d3062b3f5f70b2a87520fc291701c3" +CAGRAPH_ARCHIVE = "http://www.atagar.com/arm/resources/deps/11-06-10/cagraph.tar.gz" CAGRAPH_SIG = "1439acd40ce016f4329deb216d86f36a749e4b8bf73a313a757396af6f95310d" # optionally we can do an unverified fetch from the library's sources

1 0

[arm/master] fix: using renamed functions/args in torctl
by atagar＠torproject.org 18 Jun '11

18 Jun '11

commit 00ba915dc6f24476c19b4fb67d260a64063c19ff Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jun 18 16:01:30 2011 -0700 fix: using renamed functions/args in torctl The torctl patches had some functions and arguments renamed while being merged so using those. --- src/cli/headerPanel.py | 2 +- src/starter.py | 2 +- src/util/torTools.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/cli/headerPanel.py b/src/cli/headerPanel.py index 145e75b..7e0f639 100644 --- a/src/cli/headerPanel.py +++ b/src/cli/headerPanel.py @@ -133,7 +133,7 @@ class HeaderPanel(panel.Panel, threading.Thread): elif key in (ord('r'), ord('R')) and not self._isTorConnected: try: ctlAddr, ctlPort = self._config["startup.interface.ipAddress"], self._config["startup.interface.port"] - tmpConn, authType, authValue = TorCtl.TorCtl.connectionComp(ctlAddr, ctlPort) + tmpConn, authType, authValue = TorCtl.TorCtl.preauth_connect(ctlAddr, ctlPort) if authType == TorCtl.TorCtl.AUTH_TYPE.PASSWORD: authValue = cli.popups.inputPrompt("Controller Password: ") diff --git a/src/starter.py b/src/starter.py index 94bb30b..e060274 100644 --- a/src/starter.py +++ b/src/starter.py @@ -358,7 +358,7 @@ if __name__ == '__main__': # making this a much bigger hack). try: - tmpConn, authType, cookiePath = TorCtl.TorCtl.connectionComp(controlAddr, controlPort) + tmpConn, authType, cookiePath = TorCtl.TorCtl.preauth_connect(controlAddr, controlPort) if authType == TorCtl.TorCtl.AUTH_TYPE.COOKIE: torPid = util.torTools.getPid(controlPort) diff --git a/src/util/torTools.py b/src/util/torTools.py index 17c54f0..7ea140b 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -1629,7 +1629,7 @@ class Controller(TorCtl.PostEventListener): if self.isAlive(): # fetch the current network status if not provided if not nsList: - try: nsList = self.conn.get_network_status(getIterator=True) + try: nsList = self.conn.get_network_status(get_iterator=True) except (socket.error, TorCtl.TorCtlClosed, TorCtl.ErrorReply): nsList = [] # construct mappings of ips to relay data

1 0

[arm/master] fix: miscropping strings breaking on first word
by atagar＠torproject.org 18 Jun '11

18 Jun '11

commit e6b64e48e67a5590a4069510f7f53bb28c11ed7d Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jun 17 19:29:36 2011 -0700 fix: miscropping strings breaking on first word When cropping strings where we'd be splitting the first word only the last character would be dropped. For instance... >>> uiTools.cropStr("CookieAuthFileGroupReadable", 8) 'CookieAuthFileGroupReadabl...' rather than... >>> uiTools.cropStr("CookieAuthFileGroupReadable", 8) 'Cooki...' --- src/util/uiTools.py | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/util/uiTools.py b/src/util/uiTools.py index 5204960..1b32caa 100644 --- a/src/util/uiTools.py +++ b/src/util/uiTools.py @@ -242,13 +242,22 @@ def cropStr(msg, size, minWordLen = 4, minCrop = 0, endType = Ending.ELLIPSE, ge # checks if there isn't the minimum space needed to include anything lastWordbreak = msg.rfind(" ", 0, size + 1) - lastWordbreak = len(msg[:lastWordbreak].rstrip()) # drops extra ending whitespaces - if (minWordLen != None and size < minWordLen) or (minWordLen == None and lastWordbreak < 1): - if getRemainder: return ("", msg) - else: return "" - if minWordLen == None: minWordLen = sys.maxint - includeCrop = size - lastWordbreak - 1 >= minWordLen + if lastWordbreak == -1: + # we're splitting the first word + if minWordLen == None or size < minWordLen: + if getRemainder: return ("", msg) + else: return "" + + includeCrop = True + else: + lastWordbreak = len(msg[:lastWordbreak].rstrip()) # drops extra ending whitespaces + if (minWordLen != None and size < minWordLen) or (minWordLen == None and lastWordbreak < 1): + if getRemainder: return ("", msg) + else: return "" + + if minWordLen == None: minWordLen = sys.maxint + includeCrop = size - lastWordbreak - 1 >= minWordLen # if there's a max crop size then make sure we're cropping at least that many characters if includeCrop and minCrop:

1 0

[arm/master] Filling blank space in circ entries with nickname
by atagar＠torproject.org 18 Jun '11

18 Jun '11

commit 5e1109836be738ce17adf596d5942f8dab98c020 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jun 17 20:17:56 2011 -0700 Filling blank space in circ entries with nickname The circuit entries on the connection panel had empty space besides the ip address field. Using this for the nickname. --- src/cli/connections/circEntry.py | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/cli/connections/circEntry.py b/src/cli/connections/circEntry.py index 82ef0ff..f94f53a 100644 --- a/src/cli/connections/circEntry.py +++ b/src/cli/connections/circEntry.py @@ -192,6 +192,10 @@ class CircLine(connEntry.ConnectionLine): # dst width is derived as: # src (21) + dst (26) + divider (7) + right gap (2) - bracket (3) = 53 char dst = "%-53s" % self.getDestinationLabel(53, includeLocale = True) + + # fills the nickname into the empty space here + dst = "%s%-25s " % (dst[:25], uiTools.cropStr(self.foreign.getNickname(), 25, 0)) + etc = self.getEtcContent(width - baselineSpace - len(dst), listingType) elif listingType == entries.ListingType.HOSTNAME: # min space for the hostname is 40 characters

1 0

[arm/master] fix: cropping whitespace-only strings could crash
by atagar＠torproject.org 18 Jun '11

18 Jun '11

commit 4aa35c2f4ad2445a948a05f46b07a7636ff2aac3 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jun 17 20:06:55 2011 -0700 fix: cropping whitespace-only strings could crash When cropping strings that started with whitespace and we didn't have enough room for any of the words we would crash (index error due to referencing the -1 index of an empty string). --- src/util/uiTools.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/util/uiTools.py b/src/util/uiTools.py index ce467c3..40a3087 100644 --- a/src/util/uiTools.py +++ b/src/util/uiTools.py @@ -273,7 +273,8 @@ def cropStr(msg, size, minWordLen = 4, minCrop = 0, endType = Ending.ELLIPSE, ge else: returnMsg, remainder = msg[:lastWordbreak], msg[lastWordbreak:] # if this is ending with a comma or period then strip it off - if not getRemainder and returnMsg[-1] in (",", "."): returnMsg = returnMsg[:-1] + if not getRemainder and returnMsg and returnMsg[-1] in (",", "."): + returnMsg = returnMsg[:-1] if endType == Ending.ELLIPSE: returnMsg = returnMsg.rstrip() + "..."

1 0

← Newer
1
...
19
20
21
22
23
24
25
...
72
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits June 2011