From: Peter Weldon Date: 2010-11-10T02:04:40+09:00 Subject: [ruby-core:33119] [Ruby 1.9-Bug#4005] YAML fails to roundtrip Time objects --mimepart_4cd97f2222f28_56645a164041138 Content-Type: text/plain Content-Transfer-Encoding: Quoted-printable Content-Disposition: inline Issue #4005 has been updated by Peter Weldon. File 0001-Make-syck-s-Time-timestamps-write-nsec-precision-fra.patch adde= d Patch syck's handling of fractional seconds. Round-tripping of nsec Time = values now works. ---------------------------------------- http://redmine.ruby-lang.org/issues/show/4005 ---------------------------------------- http://redmine.ruby-lang.org --mimepart_4cd97f2222f28_56645a164041138 Content-Type: text/plain; name=0001-Make-syck-s-Time-timestamps-write-nsec-precision-fra.patch Content-Transfer-Encoding: Base64 Content-Disposition: attachment; filename=0001-Make-syck-s-Time-timestamps-write-nsec-precision-fra.patch RnJvbSA1NTk3MGUzMTYxMTYwOTQyYzc0MTBlNmIyNmNiNGNjM2FhYmEyN2Fm IE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBQZXRlciBXZWxkb24g PHBldGVyLndlbGRvbkBudWxsLm5ldD4KRGF0ZTogTW9uLCA4IE5vdiAyMDEw IDE2OjUzOjMyIC0wODAwClN1YmplY3Q6IFtQQVRDSF0gTWFrZSBzeWNrJ3Mg VGltZS90aW1lc3RhbXBzIHdyaXRlIG5zZWMgcHJlY2lzaW9uIGZyYWN0aW9u YWwgc2Vjb25kcywgYW5kIHJlYWQgYXJiaXRhcnkgcHJlY2lzaW9uIGZyYWN0 aW9uYWwgc2Vjb25kcy4KCi0tLQogQ2hhbmdlTG9nICAgICAgICAgICAgICAg ICAgICAgIHwgICAgOCArKysrKysrKwogZXh0L3N5Y2svbGliL3N5Y2svcnVi eXR5cGVzLnJiIHwgICAgMiArLQogZXh0L3N5Y2svcnVieWV4dC5jICAgICAg ICAgICAgIHwgICAyNyArKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0KIHRl c3Qvc3ljay90ZXN0X3lhbWwucmIgICAgICAgICB8ICAgIDQgKysrLQogNCBm aWxlcyBjaGFuZ2VkLCAyMSBpbnNlcnRpb25zKCspLCAyMCBkZWxldGlvbnMo LSkKCmRpZmYgLS1naXQgYS9DaGFuZ2VMb2cgYi9DaGFuZ2VMb2cKaW5kZXgg YTc1NTA0OC4uY2Y2N2VjZSAxMDA2NDQKLS0tIGEvQ2hhbmdlTG9nCisrKyBi L0NoYW5nZUxvZwpAQCAtMSwzICsxLDExIEBACitUdWUgTm92ICA5IDA5OjUx OjEwIDIwMTAgIFBldGVyIFdlbGRvbiAgPHBldGVyLndlbGRvbkBudWxsLm5l dD4KKworCSogZXh0L3N5Y2svbGliL3N5Y2svcnVieXR5cGVzLnJiIChUaW1l I3RvX3lhbWwpOiBlbWl0IG5zZWMKKwkgIHByZWNpc2lvbiBmcmFjdGlvbmFs IHNlY29uZHMuCisKKwkqIGV4dC9zeWNrL3J1YnlleHQuYyAobWt0aW1lX2Rv KTogc3VwcG9ydCBwYXJzaW5nIG9mIGFyYml0YXJ5CisJICBwcmVjaXNpb24g ZnJhY3Rpb25hbCBzZWNvbmRzLgorCiBTYXQgTm92ICA2IDA3OjMzOjA4IDIw MTAgIE5vYnV5b3NoaSBOYWthZGEgIDxub2J1QHJ1YnktbGFuZy5vcmc+CiAK IAkqIGNvbmZpZ3VyZS5pbiAocmJfY3ZfZXhwb3J0X3ByZWZpeCk6IGNoZWNr IGZvciBwcmVmaXhlZApkaWZmIC0tZ2l0IGEvZXh0L3N5Y2svbGliL3N5Y2sv cnVieXR5cGVzLnJiIGIvZXh0L3N5Y2svbGliL3N5Y2svcnVieXR5cGVzLnJi CmluZGV4IGY4YmJmZWEuLmI1NTA1MmYgMTAwNjQ0Ci0tLSBhL2V4dC9zeWNr L2xpYi9zeWNrL3J1Ynl0eXBlcy5yYgorKysgYi9leHQvc3ljay9saWIvc3lj ay9ydWJ5dHlwZXMucmIKQEAgLTMzOCw3ICszMzgsNyBAQCBjbGFzcyBUaW1l CiAgICAgICAgICAgICAgICAgdHogPSAiJXMlMDJkOiUwMmQiICUgWyBkaWZm ZXJlbmNlX3NpZ24sIGRpZmZlcmVuY2VfbWludXRlcyAvIDYwLCBkaWZmZXJl bmNlX21pbnV0ZXMgJSA2MF0KICAgICAgICAgICAgIGVuZAogICAgICAgICAg ICAgc3RhbmRhcmQgPSBzZWxmLnN0cmZ0aW1lKCAiJVktJW0tJWQgJUg6JU06 JVMiICkKLSAgICAgICAgICAgIHN0YW5kYXJkICs9ICIuJTA2ZCIgJSBbdXNl Y10gaWYgdXNlYy5ub256ZXJvPworICAgICAgICAgICAgc3RhbmRhcmQgKz0g Ii4lMDlkIiAlIFtuc2VjXSBpZiBuc2VjLm5vbnplcm8/CiAgICAgICAgICAg ICBzdGFuZGFyZCArPSAiICVzIiAlIFt0el0KICAgICAgICAgICAgIGlmIHRv X3lhbWxfcHJvcGVydGllcy5lbXB0eT8KICAgICAgICAgICAgICAgICBvdXQu c2NhbGFyKCB0YWd1cmksIHN0YW5kYXJkLCA6cGxhaW4gKQpkaWZmIC0tZ2l0 IGEvZXh0L3N5Y2svcnVieWV4dC5jIGIvZXh0L3N5Y2svcnVieWV4dC5jCmlu ZGV4IDI4MmYwNTIuLmE2YTQ5ODIgMTAwNjQ0Ci0tLSBhL2V4dC9zeWNrL3J1 YnlleHQuYworKysgYi9leHQvc3ljay9ydWJ5ZXh0LmMKQEAgLTIyNiw3ICsy MjYsNyBAQCBta3RpbWVfZG8oVkFMVUUgdmFyZykKICAgICBWQUxVRSBob3Vy ID0gSU5UMkZJWCgwKTsKICAgICBWQUxVRSBtaW4gPSBJTlQyRklYKDApOwog ICAgIFZBTFVFIHNlYyA9IElOVDJGSVgoMCk7Ci0gICAgbG9uZyB1c2VjOwor ICAgIFZBTFVFIHVzZWMgPSBJTlQyRklYKDApOwogCiAgICAgLyogWWVhciov CiAgICAgaWYgKCBwdHJbMF0gIT0gJ1wwJyAmJiBsZW4gPiAwICkgewpAQCAt MjcwLDIxICsyNzAsMTIgQEAgbWt0aW1lX2RvKFZBTFVFIHZhcmcpCiAKICAg ICAvKiBNaWxsaXNlY29uZCAqLwogICAgIHB0ciArPSAyOwotICAgIGlmICgg bGVuID4gcHRyIC0gc3RyICYmICpwdHIgPT0gJy4nICkKLSAgICB7Ci0gICAg ICAgIGNoYXIgcGFkZGVkW10gPSAiMDAwMDAwIjsKLSAgICAgICAgY29uc3Qg Y2hhciAqZW5kID0gcHRyICsgMTsKLSAgICAgICAgY29uc3QgY2hhciAqcCA9 IGVuZDsKLSAgICAgICAgd2hpbGUgKCBpc2RpZ2l0KCAqZW5kICkgKSBlbmQr KzsKLSAgICAgICAgaWYgKGVuZCAtIHAgPCAoaW50KXNpemVvZihwYWRkZWQp KSB7Ci0gICAgICAgICAgICBNRU1DUFkocGFkZGVkLCBwdHIgKyAxLCBjaGFy LCBlbmQgLSAocHRyICsgMSkpOwotICAgICAgICAgICAgcCA9IHBhZGRlZDsK LSAgICAgICAgfQotICAgICAgICB1c2VjID0gc3RydG9sKHAsIE5VTEwsIDEw KTsKLSAgICB9Ci0gICAgZWxzZQotICAgIHsKLSAgICAgICAgdXNlYyA9IDA7 CisgICAgaWYgKCBsZW4gPiBwdHIgLSBzdHIgJiYgKnB0ciA9PSAnLicgKSB7 CisgICAgICAgIGNvbnN0IGNoYXIgKnAgPSBwdHI7CisgICAgICAgIHB0cisr OworICAgICAgICB3aGlsZSAoIGlzZGlnaXQoICpwdHIgKSApIHB0cisrOwor ICAgICAgICB1c2VjID0gcmJfUmF0aW9uYWwxKHJiX3N0cl9uZXcocCwgcHRy IC0gcCkpOworICAgICAgICB1c2VjID0gcmJfZnVuY2FsbCh1c2VjLCAnKics IDEsIElOVDJGSVgoMTAwMDAwMCkpOwogICAgIH0KIAogICAgIC8qIFRpbWUg Wm9uZSovCkBAIC0zMTIsMTIgKzMwMywxMiBAQCBta3RpbWVfZG8oVkFMVUUg dmFyZykKICAgICAgICAgdGltZSA9IHJiX2Z1bmNhbGwocmJfY1RpbWUsIHNf dXRjLCA2LCB5ZWFyLCBtb24sIGRheSwgaG91ciwgbWluLCBzZWMpOwogICAg ICAgICB0bXAgPSByYl9mdW5jYWxsKHRpbWUsIHNfdG9faSwgMCk7CiAgICAg ICAgIHRtcCA9IHJiX2Z1bmNhbGwodG1wLCAnLScsIDEsIExPTkcyRklYKHR6 X29mZnNldCkpOwotICAgICAgICByZXR1cm4gcmJfZnVuY2FsbChyYl9jVGlt ZSwgc19hdCwgMiwgdG1wLCBMT05HMk5VTSh1c2VjKSk7CisgICAgICAgIHJl dHVybiByYl9mdW5jYWxsKHJiX2NUaW1lLCBzX2F0LCAyLCB0bXAsIHVzZWMp OwogICAgIH0KICAgICBlbHNlCiAgICAgewogICAgICAgICAvKiBNYWtlIFVU QyB0aW1lKi8KLSAgICAgICAgcmV0dXJuIHJiX2Z1bmNhbGwocmJfY1RpbWUs IHNfdXRjLCA3LCB5ZWFyLCBtb24sIGRheSwgaG91ciwgbWluLCBzZWMsIExP TkcyTlVNKHVzZWMpKTsKKyAgICAgICAgcmV0dXJuIHJiX2Z1bmNhbGwocmJf Y1RpbWUsIHNfdXRjLCA3LCB5ZWFyLCBtb24sIGRheSwgaG91ciwgbWluLCBz ZWMsIHVzZWMpOwogICAgIH0KIH0KIApkaWZmIC0tZ2l0IGEvdGVzdC9zeWNr L3Rlc3RfeWFtbC5yYiBiL3Rlc3Qvc3ljay90ZXN0X3lhbWwucmIKaW5kZXgg M2Q5ZDdhYi4uY2E3OGYyYSAxMDA2NDQKLS0tIGEvdGVzdC9zeWNrL3Rlc3Rf eWFtbC5yYgorKysgYi90ZXN0L3N5Y2svdGVzdF95YW1sLnJiCkBAIC02NSw3 ICs2NSw3IEBAIGNsYXNzIFlBTUxfVW5pdF9UZXN0cyA8IFRlc3Q6OlVuaXQ6 OlRlc3RDYXNlCiAJCQlob3VyID0gem9uZVswLDNdLnRvX2kgKiAzNjAwCiAJ CQltaW4gPSB6b25lWzMsMl0udG9faSAqIDYwCiAJCQlvZnMgPSAoaG91ciAr IG1pbikKLQkJCXZhbCA9IFRpbWUuYXQoIHZhbC50dl9zZWMgLSBvZnMsIHZh bC50dl9uc2VjIC8gMTAwMC4wICkKKwkJCXZhbCA9IHZhbCAtIG9mcwogCQll bmQKIAkJcmV0dXJuIHZhbAogCWVuZApAQCAtMTA5Miw5ICsxMDkyLDExIEBA IEVPWQogCQlhc3NlcnRfcGFyc2Vfb25seSgKIAkJCXsgInNwYWNlIHNlcGFy YXRlZCIgPT4gbWt0aW1lKCAyMDAxLCAxMiwgMTQsIDIxLCA1OSwgNDMsICIu MTAiLCAiLTA1OjAwIiApLAogCQkJICAiY2Fub25pY2FsIiA9PiBta3RpbWUo IDIwMDEsIDEyLCAxNSwgMiwgNTksIDQzLCAiLjEwIiApLAorCQkJICAibnNl YyIgPT4gbWt0aW1lKCAyMDAxLCAxMiwgMTUsIDIsIDU5LCA0MywgIi4wMDAw MDAwMDEiICksCiAJCQkgICJkYXRlIChub29uIFVUQykiID0+IERhdGUubmV3 KCAyMDAyLCAxMiwgMTQpLAogCQkJICAidmFsaWQgaXNvODYwMSIgPT4gbWt0 aW1lKCAyMDAxLCAxMiwgMTQsIDIxLCA1OSwgNDMsICIuMTAiLCAiLTA1OjAw IiApIH0sIDw8RU9ZCiBjYW5vbmljYWw6IDIwMDEtMTItMTVUMDI6NTk6NDMu MVoKK25zZWM6IDIwMDEtMTItMTVUMDI6NTk6NDMuMDAwMDAwMDAxWgogdmFs aWQgaXNvODYwMTogMjAwMS0xMi0xNHQyMTo1OTo0My4xMC0wNTowMAogc3Bh Y2Ugc2VwYXJhdGVkOiAyMDAxLTEyLTE0IDIxOjU5OjQzLjEwIC0wNTowMAog ZGF0ZSAobm9vbiBVVEMpOiAyMDAyLTEyLTE0Ci0tIAoxLjcuMS5tc3lzZ2l0 LjAKCg== --mimepart_4cd97f2222f28_56645a164041138--