[pypy-commit] lang-js default: fixed merge.

[andrewsmedina]

Author: Andrews Medina <andrewsmedina at gmail.com>
Branch: 
Changeset: r392:fea399d190db
Date: 2013-05-20 00:18 -0300
http://bitbucket.org/pypy/lang-js/changeset/fea399d190db/

Log:	fixed merge.

diff --git a/js/jsobj.py b/js/jsobj.py
--- a/js/jsobj.py
+++ b/js/jsobj.py
@@ -324,7 +324,7 @@
 
         own_desc = self.get_own_property(p)
         if is_data_descriptor(own_desc) is True:
-            value_desc = PropertyDescriptor(value=v, writable=True)
+            value_desc = PropertyDescriptor(value=v)
             self.define_own_property(p, value_desc, throw)
             return