Slightly refactor httpolice.known

httpolice/known/__init__.py

@@ -3,6 +3,7 @@
 from httpolice import structure
 from httpolice.known.alt_svc_param import known as altsvc
 from httpolice.known.auth_scheme import known as auth
+from httpolice.known.base import KnownDict
 from httpolice.known.cache_directive import known as cache
 from httpolice.known.content_coding import known as cc
 from httpolice.known.header import known as h
@@ -17,27 +18,18 @@
 from httpolice.known.upgrade_token import known as upgrade
 from httpolice.known.warn_code import known as warn
 
-classes = {
-    structure.AltSvcParam: altsvc,
-    structure.AuthScheme: auth,
-    structure.CacheDirective: cache,
-    structure.ContentCoding: cc,
-    structure.FieldName: h,
-    structure.HSTSDirective: hsts,
-    structure.MediaType: media,
-    structure.Method: m,
-    structure.ProductName: prod,
-    structure.RangeUnit: unit,
-    structure.RelationType: rel,
-    structure.StatusCode: st,
-    structure.TransferCoding: tc,
-    structure.UpgradeToken: upgrade,
-    structure.WarnCode: warn,
-}
+
+def _collect():
+    gs = globals()
+    return {gs[name].cls: (gs[name], name)
+            for name in gs
+            if isinstance(gs[name], KnownDict)}
+
+classes = _collect()   # This dict contains items like: ``Method: (m, 'm')``
 
 
 def get_info(obj):
-    for cls, known in classes.items():
+    for cls, (known, _) in classes.items():
         if isinstance(obj, cls):
             return known.get_info(obj)
 

httpolice/known/alt_svc_param.py

@@ -10,7 +10,7 @@ def parser_for(name):
     return known.get_info(name).get('parser')
 
 
-known = KnownDict([
+known = KnownDict(AltSvcParam, [
  {'_': AltSvcParam(u'ma'),
   '_citations': [RFC(7838, section=(3, 1))],
   'parser': rfc7838.ma},

httpolice/known/auth_scheme.py

@@ -5,7 +5,7 @@
 from httpolice.structure import AuthScheme
 
 
-known = KnownDict([
+known = KnownDict(AuthScheme, [
  {'_': AuthScheme(u'Basic'), '_citations': [RFC(7617)]},
  {'_': AuthScheme(u'Bearer'), '_citations': [RFC(6750)]},
  {'_': AuthScheme(u'Digest'), '_citations': [RFC(7616)]},

httpolice/known/base.py

@@ -2,7 +2,8 @@
 
 class KnownDict(object):
 
-    def __init__(self, items, extra_info=None, name_from_title=False):
+    def __init__(self, cls, items, extra_info=None, name_from_title=False):
+        self.cls = cls
         allowed_info = set(['_', '_citations', '_no_sync', '_title'] +
                            (extra_info or []))
         self._name_from_title = name_from_title

httpolice/known/cache_directive.py

@@ -42,7 +42,7 @@ def parser_for(name):
 # refers to a request directive or a response directive,
 # so we have to use one, more general citation.
 
-known = KnownDict([
+known = KnownDict(CacheDirective, [
  {'_': CacheDirective(u'max-age'),
   '_citations': [RFC(7234, section=(5, 2))],
   '_no_sync': ['_citations'],

httpolice/known/content_coding.py

@@ -5,7 +5,7 @@
 from httpolice.structure import ContentCoding
 
 
-known = KnownDict([
+known = KnownDict(ContentCoding, [
  {'_': ContentCoding(u'compress'),
   '_citations': [RFC(7230, section=(4, 2, 1))]},
  {'_': ContentCoding(u'deflate'),

httpolice/known/header.py

@@ -46,7 +46,7 @@ def parser_for(name):
     return known.get_info(name).get('parser')
 
 
-known = KnownDict([
+known = KnownDict(FieldName, [
  {'_': FieldName(u'A-IM'), '_citations': [RFC(4229)]},
  {'_': FieldName(u'Accept'),
   '_citations': [RFC(7231, section=(5, 3, 2))],

httpolice/known/hsts_directive.py

@@ -21,7 +21,7 @@ def parser_for(name):
     return known.get_info(name).get('parser')
 
 
-known = KnownDict([
+known = KnownDict(HSTSDirective, [
  {'_': HSTSDirective(u'includeSubDomains'),
   '_citations': [RFC(6797, section=(6, 1, 2))],
   'argument': NO},

httpolice/known/media_type.py

@@ -21,7 +21,7 @@ def is_patch(name):
     return known.get_info(name).get('patch')
 
 
-known = KnownDict([
+known = KnownDict(MediaType, [
  {'_': MediaType(u'application/1d-interleaved-parityfec'),
   '_citations': [RFC(6015)]},
  {'_': MediaType(u'application/alto-costmap+json'), '_citations': [RFC(7285)]},

httpolice/known/method.py

@@ -17,6 +17,9 @@ def is_safe(name):
 
 class KnownMethods(KnownDict):
 
+    def __init__(self, *args, **kwargs):
+        super(KnownMethods, self).__init__(Method, *args, **kwargs)
+
     @classmethod
     def _name_for(cls, item):
         return item['_'].replace(u'-', u'_')

httpolice/known/product.py

@@ -8,7 +8,7 @@ def is_library(name):
     return known.get_info(name).get('library')
 
 
-known = KnownDict([
+known = KnownDict(ProductName, [
  {'_': ProductName(u'android-async-http'),
   'library': True},
  {'_': ProductName(u'Apache-HttpAsyncClient'),

httpolice/known/range_unit.py

@@ -5,7 +5,7 @@
 from httpolice.structure import RangeUnit
 
 
-known = KnownDict([
+known = KnownDict(RangeUnit, [
  {'_': RangeUnit(u'bytes'), '_citations': [RFC(7233, section=(2, 1))]},
  {'_': RangeUnit(u'none'), '_no_sync': True},
 ])

httpolice/known/relation_type.py

@@ -5,7 +5,7 @@
 from httpolice.structure import RelationType
 
 
-known = KnownDict([
+known = KnownDict(RelationType, [
  {'_': RelationType(u'about'), '_citations': [RFC(6903, section=(2,))]},
  {'_': RelationType(u'alternate'),
   '_citations': [Citation(None,

httpolice/known/status_code.py

@@ -14,7 +14,7 @@ def is_cacheable(code):
     return known.get_info(code).get('cacheable')
 
 
-known = KnownDict([
+known = KnownDict(StatusCode, [
  {'_': StatusCode(100),
   '_citations': [RFC(7231, section=(6, 2, 1))],
   '_title': u'Continue',

httpolice/known/transfer_coding.py

@@ -5,7 +5,7 @@
 from httpolice.structure import TransferCoding
 
 
-known = KnownDict([
+known = KnownDict(TransferCoding, [
  {'_': TransferCoding(u'chunked'),
   '_citations': [RFC(7230, section=(4, 1))]},
  {'_': TransferCoding(u'compress'),

httpolice/known/upgrade_token.py

@@ -5,7 +5,7 @@
 from httpolice.structure import UpgradeToken
 
 
-known = KnownDict([
+known = KnownDict(UpgradeToken, [
  {'_': UpgradeToken(u'HTTP'),
   '_citations': [RFC(7230, section=(2, 6))],
   '_title': u'Hypertext Transfer Protocol'},

httpolice/known/warn_code.py

@@ -5,7 +5,7 @@
 from httpolice.structure import WarnCode
 
 
-known = KnownDict([
+known = KnownDict(WarnCode, [
  {'_': WarnCode(110),
   '_citations': [RFC(7234, section=(5, 5, 1))],
   '_title': u'Response is Stale'},

httpolice/notice.py

@@ -20,7 +20,7 @@
 import lxml.etree
 import six
 
-from httpolice import citation, structure
+from httpolice import citation, known
 from httpolice.util.ordered_enum import OrderedEnum
 
 
@@ -42,19 +42,7 @@ class Severity(OrderedEnum):
     debug = 0
 
 
-known_map = {
-    'auth': structure.AuthScheme,
-    'cache': structure.CacheDirective,
-    'cc': structure.ContentCoding,
-    'h': structure.FieldName,
-    'hsts': structure.HSTSDirective,
-    'm': structure.Method,
-    'media': structure.MediaType,
-    'rel': structure.RelationType,
-    'st': structure.StatusCode,
-    'tc': structure.TransferCoding,
-    'warn': structure.WarnCode,
-}
+known_map = {name: cls for (cls, (_, name)) in known.classes.items()}
 
 
 # pylint: disable=property-on-old-class

tools/iana.py

@@ -325,7 +325,7 @@ def main():
     exit_status = 0
     for reg in Registry.__subclasses__():
         for cls, entries in reg().get_all():
-            here = httpolice.known.classes[cls]
+            (here, _) = httpolice.known.classes[cls]
             there = {entry['_']: entry for entry in entries}
             missing, mismatch = make_diff(here, there)
             for title, updates in [('missing', missing),