Merge pull request beeware#541 from kjcole/master

Fixed "noargs" error text for ascii(), bin(), callable() and chr()
kunparekh18 · May 25, 2017 · acb077e · acb077e
2 parents 2f22821 + 4e1f819
commit acb077e
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 9 deletions.
diff --git a/batavia/builtins/ascii.js b/batavia/builtins/ascii.js
@@ -9,7 +9,7 @@ function ascii(args, kwargs) {
  throw new exceptions.TypeError.$pyclass("ascii() doesn't accept keyword arguments")
  }
  if (!args || args.length !== 1) {
- throw new exceptions.TypeError.$pyclass('ascii() takes exactly 1 argument (' + args.length + ' given)')
+ throw new exceptions.TypeError.$pyclass('ascii() takes exactly one argument (' + args.length + ' given)')
  }
 
  var repr_string = repr([args[0]], null)

diff --git a/batavia/builtins/bin.js b/batavia/builtins/bin.js
@@ -10,16 +10,21 @@ function bin(args, kwargs) {
  throw new exceptions.TypeError.$pyclass("bin() doesn't accept keyword arguments")
  }
  if (!args || args.length !== 1) {
- throw new exceptions.TypeError.$pyclass('bin() expected exactly 1 argument (' + args.length + ' given)')
+ throw new exceptions.TypeError.$pyclass('bin() takes exactly one argument (' + args.length + ' given)')
  }
 
  var obj = args[0]
 
- if (!types.isinstance(obj, types.Int)) {
+ if (!types.isinstance(obj, types.Int) &&
+ !types.isinstance(obj, types.Bool)) {
  throw new exceptions.TypeError.$pyclass(
  "'" + type_name(obj) + "' object cannot be interpreted as an integer")
  }
 
+ if (types.isinstance(obj, types.Bool)) {
+ return new types.Str('0b' + obj.__int__().toString(2))
+ }
+
  return new types.Str('0b' + obj.toString(2))
 }
 bin.__doc__ = 'bin(number) -> string\n\nReturn the binary representation of an integer.\n\n '

diff --git a/batavia/builtins/callable.js b/batavia/builtins/callable.js
@@ -9,7 +9,7 @@ function callable(args, kwargs) {
  throw new exceptions.TypeError.$pyclass("callable() doesn't accept keyword arguments")
  }
  if (!args || args.length !== 1) {
- throw new exceptions.TypeError.$pyclass('callable() expected exactly 1 argument (' + args.length + ' given)')
+ throw new exceptions.TypeError.$pyclass('callable() takes exactly one argument (' + args.length + ' given)')
  }
  if ((args[0] instanceof Function) || (args[0] instanceof types.Function)) {
  return new types.Bool(true)

diff --git a/batavia/builtins/chr.js b/batavia/builtins/chr.js
@@ -1,3 +1,4 @@
+var constants = require('../core').constants
 var exceptions = require('../core').exceptions
 var types = require('../types')
 
@@ -9,7 +10,18 @@ function chr(args, kwargs) {
  throw new exceptions.TypeError.$pyclass('chr() takes no keyword arguments')
  }
  if (!args || args.length !== 1) {
- throw new exceptions.TypeError.$pyclass('chr() takes exactly 1 argument (' + args.length + ' given)')
+ switch (constants.BATAVIA_MAGIC) {
+ case constants.BATAVIA_MAGIC_34:
+ throw new exceptions.TypeError.$pyclass('chr() takes exactly 1 argument (' + args.length + ' given)')
+
+ case constants.BATAVIA_MAGIC_35a0:
+ case constants.BATAVIA_MAGIC_35:
+ case constants.BATAVIA_MAGIC_353:
+ throw new exceptions.TypeError.$pyclass('chr() takes exactly one argument (' + args.length + ' given)')
+
+ default:
+ throw new exceptions.BataviaError.$pyclass('Unsupported BATAVIA_MAGIC. Possibly using unsupported Python version (supported: 3.4, 3.5)')
+ }
  }
  return new types.Str(String.fromCharCode(args[0]))
  // After tests pass, let's try saving one object creation

diff --git a/tests/builtins/test_ascii.py b/tests/builtins/test_ascii.py
@@ -15,7 +15,6 @@ class BuiltinAsciiFunctionTests(BuiltinFunctionTestCase, TranspileTestCase):
  functions = ["ascii"]
 
  not_implemented = [
- 'test_noargs',
  'test_class',
  'test_NotImplemented',
  ]
diff --git a/tests/builtins/test_bin.py b/tests/builtins/test_bin.py
@@ -19,7 +19,5 @@ class BuiltinBinFunctionTests(BuiltinFunctionTestCase, TranspileTestCase):
  functions = ["bin"]
 
  not_implemented = [
- 'test_noargs',
- 'test_bool',
  'test_int',
  ]
diff --git a/tests/builtins/test_callable.py b/tests/builtins/test_callable.py
@@ -9,6 +9,5 @@ class BuiltinCallableFunctionTests(BuiltinFunctionTestCase, TranspileTestCase):
  functions = ["callable"]
 
  not_implemented = [
- 'test_noargs',
  'test_class',
  ]