Ticket #1682: fix-1682_2.git.patch

File fix-1682_2.git.patch, 2.8 KB (added by from_pycon, at 2012-03-13T03:13:02Z)

  • src/allmydata/__init__.py 

    Thu Mar  8 15:17:19 PST 2012  david-sarah@jacaranda.org
  * Update various references to allmydata.org or http://tahoe-lafs.org in comments, to https://tahoe-lafs.org. refs #1682
diff -rN -u old-tahoe-lafs/src/allmydata/__init__.py new-tahoe-lafs/src/allmydata/__init__.py
    old new  
    11"""
    22Decentralized storage grid.
    33
    4 community web site: U{http://tahoe-lafs.org/}
     4community web site: U{https://tahoe-lafs.org/}
    55"""
    66
    77class PackagingError(EnvironmentError):
    … …  
    2929
    3030# __full_version__ is the one that you ought to use when identifying yourself in the
    3131# "application" part of the Tahoe versioning scheme:
    32 # http://allmydata.org/trac/tahoe-lafs/wiki/Versioning
     32# https://tahoe-lafs.org/trac/tahoe-lafs/wiki/Versioning
    3333__full_version__ = __appname__ + '/' + str(__version__)
    3434
    3535import os, platform, re, subprocess, sys, traceback
    … …  
    156156    # must import the packages in order to check their versions and paths.
    157157
    158158    # This warning is generated by twisted, PyRex, and possibly other packages,
    159     # but can happen at any time, not only when they are imported. See
    160     # http://tahoe-lafs.org/trac/tahoe-lafs/ticket/1129 .
     159    # but can happen at any time, not only when they are imported. See ticket #1129.
    161160    warnings.filterwarnings("ignore", category=DeprecationWarning,
    162161        message="BaseException.message has been deprecated as of Python 2.6",
    163162        append=True)
    164163
    165164    # This is to suppress various DeprecationWarnings and UserWarnings that
    166165    # occur when modules are imported.  See #859, #1435 and
    167     # http://divmod.org/trac/ticket/2994 .
     166    # http://divmod.org/trac/ticket/2994 [broken link].
    168167
    169168    for msg in deprecation_messages:
    170169        warnings.filterwarnings("ignore", category=DeprecationWarning, message=msg, append=True)

  • src/allmydata/uri.py 

    diff -rN -u old-tahoe-lafs/src/allmydata/uri.py new-tahoe-lafs/src/allmydata/uri.py
    old new  
    834834    # on all URIs, even though we would only strictly need to do so for caps of
    835835    # new formats (post Tahoe-LAFS 1.6). URIs that are not consistent with their
    836836    # prefix are treated as unknown. This should be revisited when we add the
    837     # new cap formats. See <http://allmydata.org/trac/tahoe-lafs/ticket/833#comment:31>.
     837    # new cap formats. See ticket #833 comment:31.
    838838    s = u
    839839    can_be_mutable = can_be_writeable = not deep_immutable
    840840    if s.startswith(ALLEGED_IMMUTABLE_PREFIX):