Merge code changes from upstream r702

daviddrysdale · daviddrysdale · commit 36d92e7a570e · 2014-09-24T08:11:54.000+01:00
diff --git a/python/phonenumbers/phonenumberutil.py b/python/phonenumbers/phonenumberutil.py
@@ -1635,9 +1635,7 @@ def number_type(numobj):
 
 def _number_type_helper(national_number, metadata):
     """Return the type of the given number against the metadata"""
-    general_desc = metadata.general_desc
-    if (general_desc.national_number_pattern is None or
-        not _is_number_matching_desc(national_number, general_desc)):
+    if not _is_number_matching_desc(national_number, metadata.general_desc):
         return PhoneNumberType.UNKNOWN
     if _is_number_matching_desc(national_number, metadata.premium_rate):
         return PhoneNumberType.PREMIUM_RATE
@@ -1734,16 +1732,7 @@ def is_valid_number_for_region(numobj, region_code):
         # Either the region code was invalid, or the country calling code for
         # this number does not match that of the region code.
         return False
-    general_desc = metadata.general_desc
     nsn = national_significant_number(numobj)
-
-    # For regions where we don't have metadata for PhoneNumberDesc, we treat
-    # any number passed in as a valid number if its national significant
-    # number is between the minimum and maximum lengths defined by ITU for a
-    # national significant number.
-    if general_desc.national_number_pattern is None:
-        num_len = len(nsn)
-        return (num_len > _MIN_LENGTH_FOR_NSN and num_len < _MAX_LENGTH_FOR_NSN)
     return (_number_type_helper(nsn, metadata) != PhoneNumberType.UNKNOWN)
 
 
@@ -2012,16 +2001,6 @@ def is_possible_number_with_reason(numobj):
     # Metadata cannot be None because the country calling code is valid.
     metadata = PhoneMetadata.metadata_for_region_or_calling_code(country_code, region_code)
     general_desc = metadata.general_desc
-
-    # Handling case of numbers with no metadata.
-    if general_desc.national_number_pattern is None:
-        num_len = len(national_number)
-        if num_len < _MIN_LENGTH_FOR_NSN:
-            return ValidationResult.TOO_SHORT
-        elif num_len > _MAX_LENGTH_FOR_NSN:
-            return ValidationResult.TOO_LONG
-        else:
-            return ValidationResult.IS_POSSIBLE
     possible_re = re.compile(general_desc.possible_number_pattern or U_EMPTY_STRING)
     return _test_number_length_against_pattern(possible_re, national_number)
 
diff --git a/python/tests/phonenumberutiltest.py b/python/tests/phonenumberutiltest.py
@@ -1235,19 +1235,6 @@ def testIsPossibleNumberWithReason(self):
         self.assertEqual(ValidationResult.TOO_LONG,
                          phonenumbers.is_possible_number_with_reason(INTERNATIONAL_TOLL_FREE_TOO_LONG))
 
-        # Try with number that we don't have metadata for.
-        adNumber = PhoneNumber(country_code=376, national_number=12345)
-        self.assertEqual(ValidationResult.IS_POSSIBLE,
-                         phonenumbers.is_possible_number_with_reason(adNumber))
-        adNumber.country_code = 376
-        adNumber.national_number = to_long(1)
-        self.assertEqual(ValidationResult.TOO_SHORT,
-                         phonenumbers.is_possible_number_with_reason(adNumber))
-        adNumber.country_code = 376
-        adNumber.national_number = to_long(123456789012345678)
-        self.assertEqual(ValidationResult.TOO_LONG,
-                         phonenumbers.is_possible_number_with_reason(adNumber))
-
     def testIsNotPossibleNumber(self):
         self.assertFalse(phonenumbers.is_possible_number(US_LONG_NUMBER))
         self.assertFalse(phonenumbers.is_possible_number(INTERNATIONAL_TOLL_FREE_TOO_LONG))
@@ -2238,7 +2225,7 @@ def testCountryWithNoNumberDesc(self):
         self.assertEqual("+37612345", phonenumbers.format_number(adNumber, PhoneNumberFormat.E164))
         self.assertEqual("12345", phonenumbers.format_number(adNumber, PhoneNumberFormat.NATIONAL))
         self.assertEqual(PhoneNumberType.UNKNOWN, phonenumbers.number_type(adNumber))
-        self.assertTrue(phonenumbers.is_valid_number(adNumber))
+        self.assertFalse(phonenumbers.is_valid_number(adNumber))
 
         # Test dialing a US number from within Andorra.
         self.assertEqual("00 1 650 253 0000",
