Bug 957156 - Expire telemetry histograms by default also in development channels. r=vladan

toolkit/components/telemetry/histogram_tools.py

@@ -177,9 +177,12 @@ is enabled."""
         if not expiration:
             return
 
-        if not re.match(r'[1-9][0-9]*\..*|never', expiration):
-            raise BaseException, '%s not permitted as an expiration version for %s; the complete version name is required ' \
-                                 '(see https://developer.mozilla.org/en-US/docs/Performance/Adding_a_new_Telemetry_probe)' % (expiration, name)
+        if re.match(r'^[1-9][0-9]*$', expiration):
+            expiration = expiration + ".0a1"
+        elif re.match(r'^[1-9][0-9]*\.0$', expiration):
+            expiration = expiration + "a1"
+
+        definition['expires_in_version'] = expiration
 
     @staticmethod
     def check_keys(name, definition, allowed_keys):