From 1d34e324319c3b9c22ea045d1fbe526bc05a48b4 Mon Sep 17 00:00:00 2001
From: Damien George <damien.p.george@gmail.com>
Date: Sun, 11 May 2014 18:28:48 +0100
Subject: [PATCH] py: frozenset() creates an empty frozenset.

---
 py/objset.c                | 17 +++++++++--------
 tests/basics/frozenset1.py |  3 +++
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/py/objset.c b/py/objset.c
index 4198dac18f..a6f1fe7339 100644
--- a/py/objset.c
+++ b/py/objset.c
@@ -121,15 +121,19 @@ STATIC void set_print(void (*print)(void *env, const char *fmt, ...), void *env,
 
 
 STATIC mp_obj_t set_make_new(mp_obj_t type_in, uint n_args, uint n_kw, const mp_obj_t *args) {
-    // TODO check n_kw == 0
+    mp_arg_check_num(n_args, n_kw, 0, 1, false);
 
     switch (n_args) {
-        case 0:
-            // return a new, empty set
-            return mp_obj_new_set(0, NULL);
+        case 0: {
+            // create a new, empty set
+            mp_obj_set_t *set = mp_obj_new_set(0, NULL);
+            // set actual set/frozenset type
+            set->base.type = type_in;
+            return set;
+        }
 
         case 1:
-        {
+        default: { // can only be 0 or 1 arg
             // 1 argument, an iterable from which we make a new set
             mp_obj_set_t *set = mp_obj_new_set(0, NULL);
             mp_obj_t iterable = mp_getiter(args[0]);
@@ -141,9 +145,6 @@ STATIC mp_obj_t set_make_new(mp_obj_t type_in, uint n_args, uint n_kw, const mp_
             set->base.type = type_in;
             return set;
         }
-
-        default:
-            nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, "set takes at most 1 argument, %d given", n_args));
     }
 }
 
diff --git a/tests/basics/frozenset1.py b/tests/basics/frozenset1.py
index 02a5bf8c56..00694581f0 100644
--- a/tests/basics/frozenset1.py
+++ b/tests/basics/frozenset1.py
@@ -7,6 +7,9 @@ except NameError:
     import sys
     sys.exit()
 
+s = frozenset()
+print(s)
+
 s = frozenset({1})
 print(s)