From: Evan Phoenix Date: 2006-03-27T16:50:48+09:00 Subject: PATCH: A subclassable Pathname ------=_Part_18709_18656179.1143445830255 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline A simply change (changing all references of "Pathname.new" to "self.class.new") allows for an easily subclassable Pathname. I doubt I need to explain why thats a good thing. -- When I do good, I feel good; when I do bad, I feel bad, and that is my religion. -- Abraham Lincoln (1809 - 1865) ------=_Part_18709_18656179.1143445830255 Content-Type: application/octet-stream; name="subclassable-pathname.diff" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="subclassable-pathname.diff" X-Attachment-Id: f_ga5aio LS0tIC91c3IvbG9jYWwvbGliL3J1YnkvMS44L3BhdGhuYW1lLnJiCTIwMDUtMDctMTAgMDg6MTc6 MzUuMDAwMDAwMDAwIC0wNzAwCisrKyBwYXRobmFtZS5yYgkyMDA2LTAzLTI2IDIzOjMxOjU0LjAw MDAwMDAwMCAtMDgwMApAQCAtMjU4LDcgKzI1OCw3IEBACiAgICAgIyBjbGVhbnBhdGhfYWdncmVz c2l2ZSBhc3N1bWVzOgogICAgICMgKiBubyBzeW1saW5rCiAgICAgIyAqIGFsbCBwYXRobmFtZSBw cmVmaXggY29udGFpbmVkIGluIHRoZSBwYXRobmFtZSBpcyBleGlzdGluZyBkaXJlY3RvcnkKLSAg ICByZXR1cm4gUGF0aG5hbWUubmV3KCcnKSBpZiBAcGF0aCA9PSAnJworICAgIHJldHVybiBzZWxm LmNsYXNzLm5ldygnJykgaWYgQHBhdGggPT0gJycKICAgICBhYnNvbHV0ZSA9IGFic29sdXRlPwog ICAgIG5hbWVzID0gW10KICAgICBAcGF0aC5zY2FuKCVye1teL10rfSkge3xuYW1lfApAQCAtMjc1 LDIwICsyNzUsMjAgQEAKICAgICAgIGVuZAogICAgICAgbmFtZXMgPDwgbmFtZQogICAgIH0KLSAg ICByZXR1cm4gUGF0aG5hbWUubmV3KGFic29sdXRlID8gJy8nIDogJy4nKSBpZiBuYW1lcy5lbXB0 eT8KKyAgICByZXR1cm4gc2VsZi5jbGFzcy5uZXcoYWJzb2x1dGUgPyAnLycgOiAnLicpIGlmIG5h bWVzLmVtcHR5PwogICAgIHBhdGggPSBhYnNvbHV0ZSA/ICcvJyA6ICcnCiAgICAgcGF0aCA8PCBu YW1lcy5qb2luKCcvJykKLSAgICBQYXRobmFtZS5uZXcocGF0aCkKKyAgICBzZWxmLmNsYXNzLm5l dyhwYXRoKQogICBlbmQKICAgcHJpdmF0ZSA6Y2xlYW5wYXRoX2FnZ3Jlc3NpdmUKIAogICBkZWYg Y2xlYW5wYXRoX2NvbnNlcnZhdGl2ZQotICAgIHJldHVybiBQYXRobmFtZS5uZXcoJycpIGlmIEBw YXRoID09ICcnCisgICAgcmV0dXJuIHNlbGYuY2xhc3MubmV3KCcnKSBpZiBAcGF0aCA9PSAnJwog ICAgIG5hbWVzID0gQHBhdGguc2NhbiglcntbXi9dK30pCiAgICAgbGFzdF9kb3QgPSBuYW1lcy5s YXN0ID09ICcuJwogICAgIG5hbWVzLmRlbGV0ZSgnLicpCiAgICAgbmFtZXMuc2hpZnQgd2hpbGUg bmFtZXMuZmlyc3QgPT0gJy4uJyBpZiBhYnNvbHV0ZT8KLSAgICByZXR1cm4gUGF0aG5hbWUubmV3 KGFic29sdXRlPyA/ICcvJyA6ICcuJykgaWYgbmFtZXMuZW1wdHk/CisgICAgcmV0dXJuIHNlbGYu Y2xhc3MubmV3KGFic29sdXRlPyA/ICcvJyA6ICcuJykgaWYgbmFtZXMuZW1wdHk/CiAgICAgcGF0 aCA9IGFic29sdXRlPyA/ICcvJyA6ICcnCiAgICAgcGF0aCA8PCBuYW1lcy5qb2luKCcvJykKICAg ICBpZiBuYW1lcy5sYXN0ICE9ICcuLicKQEAgLTI5OCw3ICsyOTgsNyBAQAogICAgICAgICBwYXRo IDw8ICcvJwogICAgICAgZW5kCiAgICAgZW5kCi0gICAgUGF0aG5hbWUubmV3KHBhdGgpCisgICAg c2VsZi5jbGFzcy5uZXcocGF0aCkKICAgZW5kCiAgIHByaXZhdGUgOmNsZWFucGF0aF9jb25zZXJ2 YXRpdmUKIApAQCAtMzYzLDkgKzM2Myw5IEBACiAgICAgZW5kCiAgICAgCiAgICAgaWYgcmVzb2x2 ZWQuZW1wdHk/Ci0gICAgICBQYXRobmFtZS5uZXcodG9wLmVtcHR5PyA/ICcuJyA6ICcvJykKKyAg ICAgIHNlbGYuY2xhc3MubmV3KHRvcC5lbXB0eT8gPyAnLicgOiAnLycpCiAgICAgZWxzZQotICAg ICAgUGF0aG5hbWUubmV3KHRvcCArIHJlc29sdmVkLmpvaW4oJy8nKSkKKyAgICAgIHNlbGYuY2xh c3MubmV3KHRvcCArIHJlc29sdmVkLmpvaW4oJy8nKSkKICAgICBlbmQKICAgZW5kCiAKQEAgLTQz MSw3ICs0MzEsNyBAQAogICAjIFRoaXMgbWV0aG9kIGRvZXNuJ3QgYWNjZXNzIHRoZSBmaWxlIHN5 c3RlbTsgaXQgaXMgcHVyZSBzdHJpbmcgbWFuaXB1bGF0aW9uLiAKICAgIwogICBkZWYgKyhvdGhl cikKLSAgICBvdGhlciA9IFBhdGhuYW1lLm5ldyhvdGhlcikgdW5sZXNzIFBhdGhuYW1lID09PSBv dGhlcgorICAgIG90aGVyID0gc2VsZi5jbGFzcy5uZXcob3RoZXIpIHVubGVzcyBQYXRobmFtZSA9 PT0gb3RoZXIKIAogICAgIHJldHVybiBvdGhlciBpZiBvdGhlci5hYnNvbHV0ZT8KIApAQCAtNDQ5 LDEzICs0NDksMTMgQEAKICAgICAgIGVuZAogICAgIGVuZAogCi0gICAgcmV0dXJuIFBhdGhuYW1l Lm5ldyhwYXRoMikgaWYgcGF0aDEgPT0gJy4nCi0gICAgcmV0dXJuIFBhdGhuYW1lLm5ldyhwYXRo MSkgaWYgcGF0aDIgPT0gJy4nCisgICAgcmV0dXJuIHNlbGYuY2xhc3MubmV3KHBhdGgyKSBpZiBw YXRoMSA9PSAnLicKKyAgICByZXR1cm4gc2VsZi5jbGFzcy5uZXcocGF0aDEpIGlmIHBhdGgyID09 ICcuJwogCiAgICAgaWYgJXJ7L1x6fSA9fiBwYXRoMQotICAgICAgUGF0aG5hbWUubmV3KHBhdGgx ICsgcGF0aDIpCisgICAgICBzZWxmLmNsYXNzLm5ldyhwYXRoMSArIHBhdGgyKQogICAgIGVsc2UK LSAgICAgIFBhdGhuYW1lLm5ldyhwYXRoMSArICcvJyArIHBhdGgyKQorICAgICAgc2VsZi5jbGFz cy5uZXcocGF0aDEgKyAnLycgKyBwYXRoMikKICAgICBlbmQKICAgZW5kCiAKQEAgLTQ2OCwxMCAr NDY4LDEwIEBACiAgIGRlZiBqb2luKCphcmdzKQogICAgIGFyZ3MudW5zaGlmdCBzZWxmCiAgICAg cmVzdWx0ID0gYXJncy5wb3AKLSAgICByZXN1bHQgPSBQYXRobmFtZS5uZXcocmVzdWx0KSB1bmxl c3MgUGF0aG5hbWUgPT09IHJlc3VsdAorICAgIHJlc3VsdCA9IHNlbGYuY2xhc3MubmV3KHJlc3Vs dCkgdW5sZXNzIFBhdGhuYW1lID09PSByZXN1bHQKICAgICByZXR1cm4gcmVzdWx0IGlmIHJlc3Vs dC5hYnNvbHV0ZT8KICAgICBhcmdzLnJldmVyc2VfZWFjaCB7fGFyZ3wKLSAgICAgIGFyZyA9IFBh dGhuYW1lLm5ldyhhcmcpIHVubGVzcyBQYXRobmFtZSA9PT0gYXJnCisgICAgICBhcmcgPSBzZWxm LmNsYXNzLm5ldyhhcmcpIHVubGVzcyBQYXRobmFtZSA9PT0gYXJnCiAgICAgICByZXN1bHQgPSBh cmcgKyByZXN1bHQKICAgICAgIHJldHVybiByZXN1bHQgaWYgcmVzdWx0LmFic29sdXRlPwogICAg IH0KQEAgLTUwNSw5ICs1MDUsOSBAQAogICAgIERpci5mb3JlYWNoKEBwYXRoKSB7fGV8CiAgICAg ICBuZXh0IGlmIGUgPT0gJy4nIHx8IGUgPT0gJy4uJwogICAgICAgaWYgd2l0aF9kaXJlY3RvcnkK LSAgICAgICAgcmVzdWx0IDw8IFBhdGhuYW1lLm5ldyhGaWxlLmpvaW4oQHBhdGgsIGUpKQorICAg ICAgICByZXN1bHQgPDwgc2VsZi5jbGFzcy5uZXcoRmlsZS5qb2luKEBwYXRoLCBlKSkKICAgICAg IGVsc2UKLSAgICAgICAgcmVzdWx0IDw8IFBhdGhuYW1lLm5ldyhlKQorICAgICAgICByZXN1bHQg PDwgc2VsZi5jbGFzcy5uZXcoZSkKICAgICAgIGVuZAogICAgIH0KICAgICByZXN1bHQKQEAgLTU1 NCw5ICs1NTQsOSBAQAogICAgIGJhc2UuZmlsbCAnLi4nCiAgICAgcmVscGF0aCA9IGJhc2UgKyBk ZXN0CiAgICAgaWYgcmVscGF0aC5lbXB0eT8KLSAgICAgIFBhdGhuYW1lLm5ldygiLiIpCisgICAg ICBzZWxmLmNsYXNzLm5ldygiLiIpCiAgICAgZWxzZQotICAgICAgUGF0aG5hbWUubmV3KHJlbHBh dGguam9pbignLycpKQorICAgICAgc2VsZi5jbGFzcy5uZXcocmVscGF0aC5qb2luKCcvJykpCiAg ICAgZW5kCiAgIGVuZAogCkBAIC02MzUsNyArNjM1LDcgQEAKICAgZW5kCiAKICAgIyBTZWUgPHR0 PkZpbGUucmVhZGxpbms8L3R0Pi4gIFJlYWQgc3ltYm9saWMgbGluay4KLSAgZGVmIHJlYWRsaW5r KCkgUGF0aG5hbWUubmV3KEZpbGUucmVhZGxpbmsoQHBhdGgpKSBlbmQKKyAgZGVmIHJlYWRsaW5r KCkgc2VsZi5jbGFzcy5uZXcoRmlsZS5yZWFkbGluayhAcGF0aCkpIGVuZAogCiAgICMgU2VlIDx0 dD5GaWxlLnJlbmFtZTwvdHQ+LiAgUmVuYW1lIHRoZSBmaWxlLgogICBkZWYgcmVuYW1lKHRvKSBG aWxlLnJlbmFtZShAcGF0aCwgdG8pIGVuZApAQCAtNjU2LDIwICs2NTYsMjAgQEAKICAgZGVmIHV0 aW1lKGF0aW1lLCBtdGltZSkgRmlsZS51dGltZShhdGltZSwgbXRpbWUsIEBwYXRoKSBlbmQKIAog ICAjIFNlZSA8dHQ+RmlsZS5iYXNlbmFtZTwvdHQ+LiAgUmV0dXJucyB0aGUgbGFzdCBjb21wb25l bnQgb2YgdGhlIHBhdGguCi0gIGRlZiBiYXNlbmFtZSgqYXJncykgUGF0aG5hbWUubmV3KEZpbGUu YmFzZW5hbWUoQHBhdGgsICphcmdzKSkgZW5kCisgIGRlZiBiYXNlbmFtZSgqYXJncykgc2VsZi5j bGFzcy5uZXcoRmlsZS5iYXNlbmFtZShAcGF0aCwgKmFyZ3MpKSBlbmQKIAogICAjIFNlZSA8dHQ+ RmlsZS5kaXJuYW1lPC90dD4uICBSZXR1cm5zIGFsbCBidXQgdGhlIGxhc3QgY29tcG9uZW50IG9m IHRoZSBwYXRoLgotICBkZWYgZGlybmFtZSgpIFBhdGhuYW1lLm5ldyhGaWxlLmRpcm5hbWUoQHBh dGgpKSBlbmQKKyAgZGVmIGRpcm5hbWUoKSBzZWxmLmNsYXNzLm5ldyhGaWxlLmRpcm5hbWUoQHBh dGgpKSBlbmQKIAogICAjIFNlZSA8dHQ+RmlsZS5leHRuYW1lPC90dD4uICBSZXR1cm5zIHRoZSBm aWxlJ3MgZXh0ZW5zaW9uLgogICBkZWYgZXh0bmFtZSgpIEZpbGUuZXh0bmFtZShAcGF0aCkgZW5k CiAKICAgIyBTZWUgPHR0PkZpbGUuZXhwYW5kX3BhdGg8L3R0Pi4KLSAgZGVmIGV4cGFuZF9wYXRo KCphcmdzKSBQYXRobmFtZS5uZXcoRmlsZS5leHBhbmRfcGF0aChAcGF0aCwgKmFyZ3MpKSBlbmQK KyAgZGVmIGV4cGFuZF9wYXRoKCphcmdzKSBzZWxmLmNsYXNzLm5ldyhGaWxlLmV4cGFuZF9wYXRo KEBwYXRoLCAqYXJncykpIGVuZAogCiAgICMgU2VlIDx0dD5GaWxlLnNwbGl0PC90dD4uICBSZXR1 cm5zIHRoZSAjZGlybmFtZSBhbmQgdGhlICNiYXNlbmFtZSBpbiBhbgogICAjIEFycmF5LgotICBk ZWYgc3BsaXQoKSBGaWxlLnNwbGl0KEBwYXRoKS5tYXAge3xmfCBQYXRobmFtZS5uZXcoZikgfSBl bmQKKyAgZGVmIHNwbGl0KCkgRmlsZS5zcGxpdChAcGF0aCkubWFwIHt8Znwgc2VsZi5jbGFzcy5u ZXcoZikgfSBlbmQKIAogICAjIFBhdGhuYW1lI2xpbmsgaXMgY29uZnVzaW5nIGFuZCAqb2Jzb2xl dGVkKiBiZWNhdXNlIHRoZSByZWNlaXZlci9hcmd1bWVudAogICAjIG9yZGVyIGlzIGludmVydGVk IHRvIGNvcnJlc3BvbmRpbmcgc3lzdGVtIGNhbGwuCkBAIC03NjEsMTQgKzc2MSwxNCBAQAogICAj IFNlZSA8dHQ+RGlyLmdsb2I8L3R0Pi4gIFJldHVybnMgb3IgeWllbGRzIFBhdGhuYW1lIG9iamVj dHMuCiAgIGRlZiBQYXRobmFtZS5nbG9iKCphcmdzKSAjIDp5aWVsZDogcAogICAgIGlmIGJsb2Nr X2dpdmVuPwotICAgICAgRGlyLmdsb2IoKmFyZ3MpIHt8ZnwgeWllbGQgUGF0aG5hbWUubmV3KGYp IH0KKyAgICAgIERpci5nbG9iKCphcmdzKSB7fGZ8IHlpZWxkIHNlbGYuY2xhc3MubmV3KGYpIH0K ICAgICBlbHNlCi0gICAgICBEaXIuZ2xvYigqYXJncykubWFwIHt8ZnwgUGF0aG5hbWUubmV3KGYp IH0KKyAgICAgIERpci5nbG9iKCphcmdzKS5tYXAge3xmfCBzZWxmLmNsYXNzLm5ldyhmKSB9CiAg ICAgZW5kCiAgIGVuZAogCiAgICMgU2VlIDx0dD5EaXIuZ2V0d2Q8L3R0Pi4gIFJldHVybnMgdGhl IGN1cnJlbnQgd29ya2luZyBkaXJlY3RvcnkgYXMgYSBQYXRobmFtZS4KLSAgZGVmIFBhdGhuYW1l LmdldHdkKCkgUGF0aG5hbWUubmV3KERpci5nZXR3ZCkgZW5kCisgIGRlZiBQYXRobmFtZS5nZXR3 ZCgpIHNlbGYuY2xhc3MubmV3KERpci5nZXR3ZCkgZW5kCiAgIGNsYXNzIDw8IHNlbGY7IGFsaWFz IHB3ZCBnZXR3ZCBlbmQKIAogICAjIFBhdGhuYW1lI2NoZGlyIGlzICpvYnNvbGV0ZWQqIGF0IDEu OC4xLgpAQCAtNzg1LDE0ICs3ODUsMTQgQEAKIAogICAjIFJldHVybiB0aGUgZW50cmllcyAoZmls ZXMgYW5kIHN1YmRpcmVjdG9yaWVzKSBpbiB0aGUgZGlyZWN0b3J5LCBlYWNoIGFzIGEKICAgIyBQ YXRobmFtZSBvYmplY3QuCi0gIGRlZiBlbnRyaWVzKCkgRGlyLmVudHJpZXMoQHBhdGgpLm1hcCB7 fGZ8IFBhdGhuYW1lLm5ldyhmKSB9IGVuZAorICBkZWYgZW50cmllcygpIERpci5lbnRyaWVzKEBw YXRoKS5tYXAge3xmfCBzZWxmLmNsYXNzLm5ldyhmKSB9IGVuZAogCiAgICMgSXRlcmF0ZXMgb3Zl ciB0aGUgZW50cmllcyAoZmlsZXMgYW5kIHN1YmRpcmVjdG9yaWVzKSBpbiB0aGUgZGlyZWN0b3J5 LiAgSXQKICAgIyB5aWVsZHMgYSBQYXRobmFtZSBvYmplY3QgZm9yIGVhY2ggZW50cnkuCiAgICMK ICAgIyBUaGlzIG1ldGhvZCBoYXMgZXhpc3RlZCBzaW5jZSAxLjguMS4KICAgZGVmIGVhY2hfZW50 cnkoJmJsb2NrKSAjIDp5aWVsZDogcAotICAgIERpci5mb3JlYWNoKEBwYXRoKSB7fGZ8IHlpZWxk IFBhdGhuYW1lLm5ldyhmKSB9CisgICAgRGlyLmZvcmVhY2goQHBhdGgpIHt8ZnwgeWllbGQgc2Vs Zi5jbGFzcy5uZXcoZikgfQogICBlbmQKIAogICAjIFBhdGhuYW1lI2Rpcl9mb3JlYWNoIGlzICpv YnNvbGV0ZWQqIGF0IDEuOC4xLgpAQCAtODI4LDkgKzgyOCw5IEBACiAgIGRlZiBmaW5kKCZibG9j aykgIyA6eWllbGQ6IHAKICAgICByZXF1aXJlICdmaW5kJwogICAgIGlmIEBwYXRoID09ICcuJwot ICAgICAgRmluZC5maW5kKEBwYXRoKSB7fGZ8IHlpZWxkIFBhdGhuYW1lLm5ldyhmLnN1Yiglcntc QVwuL30sICcnKSkgfQorICAgICAgRmluZC5maW5kKEBwYXRoKSB7fGZ8IHlpZWxkIHNlbGYuY2xh c3MubmV3KGYuc3ViKCVye1xBXC4vfSwgJycpKSB9CiAgICAgZWxzZQotICAgICAgRmluZC5maW5k KEBwYXRoKSB7fGZ8IHlpZWxkIFBhdGhuYW1lLm5ldyhmKSB9CisgICAgICBGaW5kLmZpbmQoQHBh dGgpIHt8ZnwgeWllbGQgc2VsZi5jbGFzcy5uZXcoZikgfQogICAgIGVuZAogICBlbmQKIGVuZAo= ------=_Part_18709_18656179.1143445830255--