Extend Builtin Format function

batavia/builtins/format.js

@@ -14,6 +14,9 @@ function format(args, kwargs) {
             'format() takes at most 2 arguments (' + args.length + ' given)'
         )
     }
+    if(args[1] === ""){
+        return args[0];
+    }
     if (!args[0].__format__) {
         throw new exceptions.BataviaError.$pyclass(
             '__format__ not implemented for this type.'

batavia/types/Bool.js

@@ -7,10 +7,11 @@ var NotImplemented = require('../core').NotImplemented
 /*************************************************************************
  * Modify Javascript Boolean to behave like a Python bool
  *************************************************************************/
+const className = 'bool';
 
 var Bool = Boolean
 
-create_pyclass(Bool, 'bool', true)
+create_pyclass(Bool, className, true)
 
 Bool.prototype.__dir__ = function() {
     var types = require('../types')
@@ -757,6 +758,13 @@ Bool.prototype.__trunc__ = function() {
     return new types.Int(0)
 }
 
+Bool.prototype.__format__ = function(value, formatSpecifier) {
+    if(formatSpecifier === ""){
+        return value.__str__()
+    }
+    throw new exceptions.NotImplementedError.$pyclass('bool.__format__ has not been implemented')
+}
+
 /**************************************************
  * Module exports
  **************************************************/

batavia/types/Bytearray.js

@@ -229,6 +229,13 @@ Bytearray.prototype.__len__ = function() {
     return this.val.__len__()
 }
 
+Bytearray.prototype.__format__ = function(value, formatSpecifier) {
+    if(formatSpecifier === ""){
+        return value.__str__()
+    }
+    throw new exceptions.ValueError.$pyclass('ValueError: Unknown format code' +  formatSpecifier + 'for object of type ' + className)
+}
+
 /**************************************************
  * Module exports
  **************************************************/

batavia/types/BytearrayIterator.js

@@ -5,14 +5,15 @@ var exceptions = require('../core').exceptions
 /**************************************************
  * Bytearray Iterator
  **************************************************/
+const className = 'bytearray_iterator';
 
 function BytearrayIterator(data) {
     PyObject.call(this)
     this.index = 0
     this.data = data
 };
 
-create_pyclass(BytearrayIterator, 'bytearray_iterator')
+create_pyclass(BytearrayIterator, className)
 
 BytearrayIterator.prototype.__iter__ = function() {
     return this
@@ -33,6 +34,13 @@ BytearrayIterator.prototype.__str__ = function() {
     return '<bytearray_iterator object at 0x99999999>'
 }
 
+BytearrayIterator.prototype.__format__ = function(value, formatSpecifier) {
+    if(formatSpecifier === ""){
+        return value.__str__()
+    }
+    throw new exceptions.ValueError.$pyclass('ValueError: Unknown format code' +  formatSpecifier + 'for object of type ' + className)
+}
+
 /**************************************************
  * Module exports
  **************************************************/

batavia/types/Bytes.js

@@ -12,14 +12,15 @@ var NotImplemented = require('../core').NotImplemented
 /*************************************************************************
  * A Python bytes type
  *************************************************************************/
+const className = 'bytes';
 
 function Bytes(val) {
     // the value is an instance of Feross's Buffer class
     PyObject.call(this)
     this.val = val
 }
 
-create_pyclass(Bytes, 'bytes')
+create_pyclass(Bytes, className)
 
 Bytes.prototype.__dir__ = function() {
     var types = require('../types')
@@ -310,7 +311,7 @@ Bytes.prototype.__getitem__ = function(other) {
     var types = require('../types')
 
     if (types.isinstance(other, types.Slice)) {
-        throw new exceptions.NotImplementedError.$pyclass('Bytes.__getitem__ with slice has not been implemented')
+        throw new exceptions.NotImplementedError.$pyclass('bytes.__getitem__ with slice has not been implemented')
     }
     if (!types.isinstance(other, types.Int)) {
         throw new exceptions.TypeError.$pyclass('byte indices must be integers or slices, not ' + type_name(other))
@@ -363,6 +364,13 @@ Bytes.prototype.decode = function(encoding, errors) {
     }
 }
 
+Bytes.prototype.__format__ = function(value, formatSpecifier) {
+    if(formatSpecifier === ""){
+        return value.__str__()
+    }
+    throw new exceptions.ValueError.$pyclass('ValueError: Unknown format code' +  formatSpecifier + 'for object of type ' + className)
+}
+
 /**************************************************
  * Module exports
  **************************************************/

batavia/types/BytesIterator.js

@@ -33,6 +33,13 @@ BytesIterator.prototype.__str__ = function() {
     return '<bytes_iterator object at 0x99999999>'
 }
 
+BytesIterator.prototype.__format__ = function(value, formatSpecifier) {
+    if(formatSpecifier === ""){
+        return value.__str__()
+    }
+    throw new exceptions.ValueError.$pyclass('ValueError: Unknown format code' +  formatSpecifier + 'for object of type ' + className)
+}
+
 /**************************************************
  * Module exports
  **************************************************/

batavia/types/CallableIterator.js

@@ -36,6 +36,13 @@ CallableIterator.prototype.__str__ = function() {
     return '<callable_iterator object at 0x99999999>'
 }
 
+CallableIterator.prototype.__format__ = function(value, formatSpecifier) {
+    if(formatSpecifier === ""){
+        return value.__str__()
+    }
+    throw new exceptions.ValueError.$pyclass('ValueError: Unknown format code' +  formatSpecifier + 'for object of type ' + className)
+}
+
 /**************************************************
  * Module exports
  **************************************************/

batavia/types/Complex.js

@@ -610,6 +610,13 @@ Complex.prototype.update = function(values) {
     }
 }
 
+Complex.prototype.__format__ = function(value, formatSpecifier) {
+    if(formatSpecifier === ""){
+        return value.__str__()
+    }
+    throw new exceptions.ValueError.$pyclass('ValueError: Unknown format code' +  formatSpecifier + 'for object of type ' + className)
+}
+
 /**************************************************
  * Module exports
  **************************************************/

batavia/types/Dict.js

@@ -672,6 +672,13 @@ Dict.prototype.fromkeys = function(iterable, value) {
     return d
 }
 
+Dict.prototype.__format__ = function(value, formatSpecifier) {
+    if(formatSpecifier === ""){
+        return value.__str__()
+    }
+    throw new exceptions.ValueError.$pyclass('ValueError: Unknown format code' +  formatSpecifier + 'for object of type ' + className)
+}
+
 /**************************************************
  * Module exports
  **************************************************/

batavia/types/Enumerate.js

@@ -30,6 +30,10 @@ Enumerate.prototype.__str__ = function() {
     return '<enumerate object at 0x99999999>'
 }
 
+Enumerate.prototype.__format__ = function (value, formatSpecifier) {
+    throw new exceptions.NotImplementedError.$pyclass('enumerate.__format__ has not been implemented')
+}
+
 /**************************************************
  * Module exports
  **************************************************/

batavia/types/Filter.js

@@ -59,6 +59,13 @@ Filter.prototype.__str__ = function() {
     return '<filter object at 0x99999999>'
 }
 
+Filter.prototype.__format__ = function(){
+    if(formatSpecifier === ""){
+        return value.__str__()
+    }
+    throw new exceptions.ValueError.$pyclass('ValueError: Unknown format code' +  formatSpecifier + 'for object of type ' + className)
+}
+
 /**************************************************
  * Module exports
  **************************************************/

batavia/types/Float.js

@@ -562,6 +562,13 @@ Float.prototype.__trunc__ = function() {
     return new types.Int(Math.trunc(this.valueOf()))
 }
 
+Float.prototype.__format__ = function(value, formatSpecifier) {
+    if(formatSpecifier === ""){
+        return value.__str__()
+    }
+    throw new exceptions.ValueError.$pyclass('ValueError: Unknown format code' +  formatSpecifier + 'for object of type ' + className)
+}
+
 /**************************************************
  * Module exports
  **************************************************/

batavia/types/FrozenSet.js

@@ -329,6 +329,10 @@ FrozenSet.prototype._update = function(args) {
     }
 }
 
+FrozenSet.prototype.__format__ = function(value, formatSpecifier) {
+    throw new exceptions.NotImplementedError.$pyclass('frozenset.__format__ has not been implemented')
+}
+
 /**************************************************
  * Module exports
  **************************************************/

batavia/types/Function.js

@@ -85,8 +85,12 @@ Function.prototype.__get__ = function(instance) {
     return new types.Method(instance, this)
 }
 
+Function.prototype.__format__ = function(value, formatSpecifier) {
+    throw new exceptions.NotImplementedError.$pyclass('function.__format__ has not been implemented')
+}
+
 /**************************************************
  * Module exports
  **************************************************/
 
-module.exports = Function
+module.exports = Function

batavia/types/Int.js

@@ -941,6 +941,13 @@ Int.prototype.__trunc__ = function() {
     return this
 }
 
+Int.prototype.__format__ = function(value, formatSpecifier) {
+    if(formatSpecifier === ""){
+        return value.__str__()
+    }
+    throw new exceptions.NotImplementedError.$pyclass('int.__format__ has not been implemented')
+}
+
 /**************************************************
  * Module exports
  **************************************************/

batavia/types/List.js

@@ -747,6 +747,13 @@ function validateIndexType(index) {
     }
 }
 
+List.prototype.__format__ = function(value, formatSpecifier) {
+    if(formatSpecifier === ""){
+        return value.__str__()
+    }
+    throw new exceptions.ValueError.$pyclass('ValueError: Unknown format code' +  formatSpecifier + 'for object of type ' + className)
+}
+
 /**************************************************
  * Module exports
  **************************************************/

batavia/types/ListIterator.js

@@ -31,6 +31,13 @@ ListIterator.prototype.__str__ = function() {
     return '<list_iterator object at 0x99999999>'
 }
 
+ListIterator.prototype.__format__ = function(value, formatSpecifier) {
+    if(formatSpecifier === ""){
+        return value.__str__()
+    }
+    throw new exceptions.ValueError.$pyclass('ValueError: Unknown format code' +  formatSpecifier + 'for object of type ' + className)
+}
+
 /**************************************************
  * Module exports
  **************************************************/

batavia/types/Map.js

@@ -56,6 +56,13 @@ Map.prototype.__str__ = function() {
     return '<map object at 0x99999999>'
 }
 
+Map.prototype.__format__ = function(value, formatSpecifier) {
+    if(formatSpecifier === ""){
+        return value.__str__()
+    }
+    throw new exceptions.ValueError.$pyclass('ValueError: Unknown format code' +  formatSpecifier + 'for object of type ' + className)
+}
+
 /**************************************************
  * Module exports
  **************************************************/

batavia/types/Method.js

@@ -23,6 +23,13 @@ function Method(instance, func) {
 Method.prototype = Object.create(Function.prototype)
 create_pyclass(Method, 'method', true)
 
+Method.prototype.__format__ = function(value, formatSpecifier) {
+    if(formatSpecifier === ""){
+        return value.__str__()
+    }
+    throw new exceptions.ValueError.$pyclass('ValueError: Unknown format code' +  formatSpecifier + 'for object of type ' + className)
+}
+
 /**************************************************
  * Module exports
  **************************************************/

batavia/types/Range.js

@@ -209,6 +209,14 @@ Range.prototype.__getitem__ = function(index) {
     }
 }
 
+Range.prototype.__format__ = function(value, formatSpecifier) {
+    if(formatSpecifier === ""){
+        return value.__str__()
+    }
+    throw new exceptions.ValueError.$pyclass('ValueError: Unknown format code' +  formatSpecifier + 'for object of type ' + className)
+    'ValueError: Unknown format code' +  formatSpecifier + 'for object of type ' + className
+}
+
 /**************************************************
  * Module exports
  **************************************************/

batavia/types/RangeIterator.js

@@ -33,6 +33,13 @@ RangeIterator.prototype.__str__ = function() {
     return '<range_iterator object at 0x99999999>'
 }
 
+RangeIterator.prototype.__format__ = function(value, formatSpecifier) {
+    if(formatSpecifier === ""){
+        return value.__str__()
+    }
+    throw new exceptions.ValueError.$pyclass('ValueError: Unknown format code' +  formatSpecifier + 'for object of type ' + className)
+}
+
 /**************************************************
  * Module exports
  **************************************************/

batavia/types/SequenceIterator.js

@@ -39,6 +39,13 @@ SequenceIterator.prototype.__str__ = function() {
     return '<iterator object at 0x99999999>'
 }
 
+SequenceIterator.prototype.__format__ = function(value, formatSpecifier) {
+    if(formatSpecifier === ""){
+        return value.__str__()
+    }
+    throw new exceptions.ValueError.$pyclass('ValueError: Unknown format code' +  formatSpecifier + 'for object of type ' + className)
+}
+
 /**************************************************
  * Module exports
  **************************************************/

batavia/types/Set.js

@@ -425,6 +425,13 @@ Set.prototype.update = function(args) {
     }
 }
 
+Set.prototype.__format__ = function(value, formatSpecifier) {
+    if(formatSpecifier === ""){
+        return value.__str__()
+    }
+    throw new exceptions.ValueError.$pyclass('ValueError: Unknown format code' +  formatSpecifier + 'for object of type ' + className)
+}
+
 /**************************************************
  * Module exports
  **************************************************/

batavia/types/SetIterator.js

@@ -32,6 +32,13 @@ SetIterator.prototype.__str__ = function() {
     return '<set_iterator object at 0x99999999>'
 }
 
+SetIterator.prototype.__format__ = function(value, formatSpecifier) {
+    if(formatSpecifier === ""){
+        return value.__str__()
+    }
+    throw new exceptions.ValueError.$pyclass('ValueError: Unknown format code' +  formatSpecifier + 'for object of type ' + className)
+}
+
 /**************************************************
  * Module exports
  **************************************************/

batavia/types/Str.js

@@ -739,6 +739,10 @@ Str.prototype.capitalize = function() {
     }
 }
 
+Str.prototype.__format__ = function(value, formatSpecifier) {
+    throw new exceptions.NotImplementedError.$pyclass('str.__format__ has not been implemented')
+}
+
 Str.prototype.format = function(args, kwargs) {
     const types = require('../types')