pythonthings
diff --git a/‎python/phonenumbers/asyoutypeformatter.py‎
Lines changed: 3 additions & 1 deletion b/‎python/phonenumbers/asyoutypeformatter.py‎
Lines changed: 3 additions & 1 deletion
diff --git a/‎python/tests/asyoutypetest.py‎
Lines changed: 9 additions & 0 deletions b/‎python/tests/asyoutypetest.py‎
Lines changed: 9 additions & 0 deletions
@@ -137,8 +137,10 @@ def _get_available_formats(self, leading_three_digits):
             format_list = self._current_metadata.intl_number_format
         else:
             format_list = self._current_metadata.number_format
+        national_prefix_is_used_by_country = (self._current_metadata.national_prefix is not None)
         for this_format in format_list:
-            if (self._is_complete_number or this_format.national_prefix_optional_when_formatting or
+            if (not national_prefix_is_used_by_country or self._is_complete_number or
+                this_format.national_prefix_optional_when_formatting or
                 _formatting_rule_has_first_group_only(this_format.national_prefix_formatting_rule)):
                 if self._is_format_eligible(this_format.format):
                     self._possible_formats.append(this_format)
 
@@ -1064,6 +1064,15 @@ def testAYTFShortNumberFormattingFix_MX(self):
         self.assertEqual("+52 800 123 456", formatter.input_digit('6'))
         self.assertEqual("+52 800 123 4567", formatter.input_digit('7'))
 
+    def testAYTFNoNationalPrefix(self):
+        formatter = AsYouTypeFormatter("IT")
+        self.assertEqual("3", formatter.input_digit('3'))
+        self.assertEqual("33", formatter.input_digit('3'))
+        self.assertEqual("333", formatter.input_digit('3'))
+        self.assertEqual("333 3", formatter.input_digit('3'))
+        self.assertEqual("333 33", formatter.input_digit('3'))
+        self.assertEqual("333 333", formatter.input_digit('3'))
+
     def testAYTFShortNumberFormattingFix_US(self):
         # For the US, an initial 1 is treated specially.
         formatter = AsYouTypeFormatter("US")