Ticket #313: copydir_re_fix.patch

File copydir_re_fix.patch, 12.2 KB (added by cfarrell, 4 years ago)

fix/workaround for the issue. Only applied on python > 2.5

  • PasteScript-1.6.2/paste/script/copydir.py

    Files BUILD.orig//PasteScript-1.6.2/docs/developer.txt and BUILD/PasteScript-1.6.2/docs/developer.txt are identical
    Files BUILD.orig//PasteScript-1.6.2/docs/example_app.ini and BUILD/PasteScript-1.6.2/docs/example_app.ini are identical
    Files BUILD.orig//PasteScript-1.6.2/docs/example_cgi_app.ini and BUILD/PasteScript-1.6.2/docs/example_cgi_app.ini are identical
    Files BUILD.orig//PasteScript-1.6.2/docs/index.txt and BUILD/PasteScript-1.6.2/docs/index.txt are identical
    Files BUILD.orig//PasteScript-1.6.2/docs/license.txt and BUILD/PasteScript-1.6.2/docs/license.txt are identical
    Files BUILD.orig//PasteScript-1.6.2/docs/news.txt and BUILD/PasteScript-1.6.2/docs/news.txt are identical
    Files BUILD.orig//PasteScript-1.6.2/ez_setup.py and BUILD/PasteScript-1.6.2/ez_setup.py are identical
    Files BUILD.orig//PasteScript-1.6.2/paste/__init__.py and BUILD/PasteScript-1.6.2/paste/__init__.py are identical
    Files BUILD.orig//PasteScript-1.6.2/paste/script/appinstall.py and BUILD/PasteScript-1.6.2/paste/script/appinstall.py are identical
    Files BUILD.orig//PasteScript-1.6.2/paste/script/bool_optparse.py and BUILD/PasteScript-1.6.2/paste/script/bool_optparse.py are identical
    Files BUILD.orig//PasteScript-1.6.2/paste/script/cgi_server.py and BUILD/PasteScript-1.6.2/paste/script/cgi_server.py are identical
    Files BUILD.orig//PasteScript-1.6.2/paste/script/checkperms.py and BUILD/PasteScript-1.6.2/paste/script/checkperms.py are identical
    Files BUILD.orig//PasteScript-1.6.2/paste/script/cherrypy_server.py and BUILD/PasteScript-1.6.2/paste/script/cherrypy_server.py are identical
    Files BUILD.orig//PasteScript-1.6.2/paste/script/command.py and BUILD/PasteScript-1.6.2/paste/script/command.py are identical
    diff -Nurbs BUILD.orig//PasteScript-1.6.2/paste/script/copydir.py BUILD/PasteScript-1.6.2/paste/script/copydir.py
    old new  
    398398class LaxTemplate(string.Template): 
    399399    # This change of pattern allows for anything in braces, but 
    400400    # only identifiers outside of braces: 
    401     pattern = re.compile(r""" 
     401    #pattern = re.compile(r""" 
     402    #\$(?: 
     403    #  (?P<escaped>\$)             |   # Escape sequence of two delimiters 
     404    #  (?P<named>[_a-z][_a-z0-9]*) |   # delimiter and a Python identifier 
     405    #  {(?P<braced>.*?)}           |   # delimiter and a braced identifier 
     406    #  (?P<invalid>)                   # Other ill-formed delimiter exprs 
     407    #) 
     408    #""", re.VERBOSE | re.IGNORECASE) 
     409    pattern = r""" 
    402410    \$(?: 
    403411      (?P<escaped>\$)             |   # Escape sequence of two delimiters 
    404412      (?P<named>[_a-z][_a-z0-9]*) |   # delimiter and a Python identifier 
    405413      {(?P<braced>.*?)}           |   # delimiter and a braced identifier 
    406414      (?P<invalid>)                   # Other ill-formed delimiter exprs 
    407415    ) 
    408     """, re.VERBOSE | re.IGNORECASE) 
     416    """