Changed class names in css/css.py to consistent title case.

git-svn-id: http://css-py.googlecode.com/svn/trunk@3 255e942d-184c-0410-a885-59fc1719c42d

Author: ijoshua

bin/css-parse

@@ -2,6 +2,7 @@
 # -*- coding: utf-8 -*-
 
 from urllib2 import urlopen
+from codecs import EncodedFile
 from optparse import OptionParser
 from css import css, csslex, cssyacc
 from css.serialize import serialize
@@ -29,7 +30,7 @@ def export(stylesheet):
 
     for i in stylesheet.imports:
         url = i.source
-        if isinstance(url, css.uri):
+        if isinstance(url, css.Uri):
             url = url.url
             importuri = uri.resolve(fileuri, url)
             importfile = urlopen(importuri)

css/css.py

@@ -8,15 +8,15 @@
 
 re_hexcolor = re.compile(r'#[0-9a-fA-F]{3,6}$')
 
-class hexcolor(object):
+class Hexcolor(object):
     '''
     An RGB color in hex notation.
     
     The value must begin with a # character and contain 3 or 6 hex digits.
     '''
     def __init__(self, value):
         if not re.match(re_hexcolor,value):            
-            raise ValueError, '''hexcolor values must start with # and contain 3 or 6 hex digits'''
+            raise ValueError, '''Hexcolor values must start with # and contain 3 or 6 hex digits.'''
 
         self.value = value[1:]
 
@@ -27,13 +27,13 @@ def __unicode__(self):
         return self.serialize(unicode)
 
     def __repr__(self):
-        return 'hexcolor(' + repr(self.value) + ')'
+        return 'Hexcolor(%r)' % ('#'+self.value,)
 
     def serialize(self, serializer):
-        return serialize.serialize_hexcolor(self, serializer)
+        return serialize.serialize_Hexcolor(self, serializer)
 
 
-class function(object):
+class Function(object):
     '''
     A term in functional notation, e.g. colors specified with rgb().
     
@@ -51,21 +51,18 @@ def __unicode__(self):
         return self.serialize(unicode)
 
     def __repr__(self):
-        r = 'function(' + repr(self.name)
-        r += ',' + repr(self.parameters)
-        r += ')'
-        return r
+        return 'Function(%r, %r)' % (self.name, self.parameters)
 
     def serialize(self, serializer):
-        return serialize.serialize_function(self, serializer)
+        return serialize.serialize_Function(self, serializer)
 
 
-class uri(object):
+class Uri(object):
     '''
     An URI.
     '''
     def __init__(self, url):
-        if isinstance(url, string):
+        if isinstance(url, String):
             url = url.value
         self.url = url
 
@@ -76,12 +73,12 @@ def __unicode__(self):
         return self.serialize(unicode)
 
     def __repr__(self):
-        return 'uri(' + repr(self.url) + ')'
+        return 'Uri(%r)' % (self.url,)
 
     def serialize(self, serializer):
-        return serialize.serialize_uri(self, serializer)
+        return serialize.serialize_Uri(self, serializer)
 
-class string(object):
+class String(object):
     '''
     A string of characters delimited by quotation marks.
     '''
@@ -95,12 +92,12 @@ def __unicode__(self):
         return self.serialize(unicode)
 
     def __repr__(self):
-        return 'string(' + repr(self.value) + ')'
+        return 'String(%r)' % (self.value,)
 
     def serialize(self, serializer):
-        return serialize.serialize_string(self, serializer)
+        return serialize.serialize_String(self, serializer)
 
-class ident(object):
+class Ident(object):
     '''
     An identifier.
     '''
@@ -114,14 +111,14 @@ def __unicode__(self):
         return self.serialize(unicode)
 
     def __repr__(self):
-        return 'ident(' + repr(self.name) + ')'
+        return 'Ident(%r)' % (self.name,)
 
     def serialize(self, serializer):
-        return serialize.serialize_ident(self, serializer)
+        return serialize.serialize_Ident(self, serializer)
 
-class term(object):
+class Term(object):
     '''
-    An expression term, other than a ident, function or hexcolor.
+    An expression term, other than a Ident, Function or Hexcolor.
     
     Quantitative terms, such as EMS may have a - or + sign as
     a unary operator.
@@ -139,17 +136,17 @@ def __unicode__(self):
         return self.serialize(unicode)
 
     def __repr__(self):
-        r = 'term(' + repr(self.value)
+        r = 'Term(' + repr(self.value)
         if self.unary_operator:
             r += ', unary_operator=' + repr(self.unary_operator)
         r += ')'
         return r
 
     def serialize(self, serializer):
-        return serialize.serialize_term(self, serializer)
+        return serialize.serialize_Term(self, serializer)
 
 
-class declaration(object):
+class Declaration(object):
     '''
     A property-value declaration with an optional important flag.
     '''
@@ -165,18 +162,18 @@ def __unicode__(self):
         return self.serialize(unicode)
 
     def __repr__(self):
-        r = 'declaration(' + repr(self.property)
+        r = 'Declaration(' + repr(self.property)
         r += ',' + repr(self.value)
         if self.important:
             r += ', important=True'
         r += ')'
         return r
 
     def serialize(self, serializer):
-        return serialize.serialize_declaration(self, serializer)
+        return serialize.serialize_Declaration(self, serializer)
 
 
-class ruleset(object):
+class Ruleset(object):
     '''
     A list of declarations for a given list of selectors.
     '''
@@ -191,14 +188,14 @@ def __unicode__(self):
         return self.serialize(unicode)
 
     def __repr__(self):
-        r = 'ruleset(' + repr(self.selectors)
+        r = 'Ruleset(' + repr(self.selectors)
         if self.declarations:
             r += ', declarations=' + repr(self.declarations)
         r += ')'
         return r
 
     def serialize(self, serializer):
-        return serialize.serialize_ruleset(self, serializer)
+        return serialize.serialize_Ruleset(self, serializer)
 
 class Charset(object):
     '''
@@ -214,7 +211,7 @@ def __unicode__(self):
         return self.serialize(unicode)
 
     def __repr__(self):
-        return 'Charset(' + repr(self.encoding) + ')'
+        return 'Charset(%r)' % (self.encoding,)
 
     def __serialize__(self, serializer):
         return serialize.serialize_charset(self, serializer)
@@ -278,8 +275,8 @@ class Import(object):
     May have an optional list of media type specifiers.
     '''
     def __init__(self, source, media_types=None):
-        if not isinstance(source, uri):
-            source = uri(source)
+        if not isinstance(source, Uri):
+            source = Uri(source)
         self.source = source
         self.media_types = media_types or list()
 
@@ -299,7 +296,7 @@ def __repr__(self):
     def serialize(self, serializer):
         return serialize.serialize_Import(self, serializer)
 
-class stylesheet(object):
+class Stylesheet(object):
     '''
     A CSS stylesheet containing a list of statements.
     
@@ -318,7 +315,7 @@ def __unicode__(self):
         return self.serialize(unicode)
 
     def __repr__(self):
-        r = 'stylesheet(' + repr(self.statements)
+        r = 'Stylesheet(' + repr(self.statements)
         if self.imports:
             r += ', imports=' + repr(self.imports)
         if self.charset:
@@ -327,6 +324,6 @@ def __repr__(self):
         return r
 
     def serialize(self, serializer):
-        return serialize.serialize_stylesheet(self, serializer)        
+        return serialize.serialize_Stylesheet(self, serializer)        
 
 

css/cssyacc.py

@@ -20,11 +20,14 @@ def URI_value(x):
     url = normalize(x)[4:-1].strip()
     if -1 != '"\''.find(url[0]):
         url = STRING_value(url)
-    return css.uri(url)
+    return css.Uri(url)
 
 def STRING_value(x):
     q = x[0]
-    return css.string(x[1:-1].replace(u'\\'+q,q))
+    return css.String(x[1:-1].replace(u'\\'+q,q))
+
+def IDENT_value(x):
+    return css.Ident(x)
 
 class cssparser(object):
     tokens = csslexer.tokens
@@ -39,7 +42,7 @@ def p_stylesheet(self, p):
             if p.slice[1].type == 'S':
                 p[0] = p[2]
             else:
-                p[0] = css.stylesheet(p[2].statements, p[2].imports, charset=p[1])
+                p[0] = css.Stylesheet(p[2].statements, p[2].imports, charset=p[1])
         else:
             p[0] = p[1]
 
@@ -65,11 +68,11 @@ def p_stylesheet2(self, p):
         else:
             statements = p[1]
 
-        if isinstance(statements, css.stylesheet):
+        if isinstance(statements, css.Stylesheet):
             imports.extend(statements.imports)
             statements = statements.statements
 
-        p[0] = css.stylesheet(statements, imports)
+        p[0] = css.Stylesheet(statements, imports)
 
     def p_stylesheet3(self, p):
         '''
@@ -83,7 +86,7 @@ def p_stylesheet3(self, p):
         '''
         p[0] = list()
         if len(p) == 3:
-            if (isinstance(p[1], css.ruleset) 
+            if (isinstance(p[1], css.Ruleset) 
                 or isinstance(p[1], css.Media)
                 or isinstance(p[1], css.Page)):
                 p[0].append(p[1])
@@ -163,7 +166,7 @@ def p_medium(self, p):
         medium : IDENT S
                | IDENT
         '''
-        p[0] = css.ident(p[1])
+        p[0] = IDENT_value(p[1])
 
     def p_page(self, p):
         '''
@@ -206,7 +209,7 @@ def p_page4(self, p):
               | page_x
         '''
         p[0] = list()
-        if isinstance(p[1], css.declaration):
+        if isinstance(p[1], css.Declaration):
             p[0].append(p[1])
 
             if len(p) == 4:
@@ -239,7 +242,7 @@ def p_pseudo_page(self, p):
         '''
         pseudo_page : ':' IDENT
         '''
-        p[0] = css.ident(p[2])
+        p[0] = IDENT_value(p[2])
 
     def p_import(self, p):
         '''
@@ -335,7 +338,7 @@ def p_property(self, p):
         property : IDENT S
                  | IDENT 
         '''
-        p[0] = css.ident(p[1])
+        p[0] = IDENT_value(p[1])
 
     def p_ruleset(self, p):
         '''
@@ -349,11 +352,11 @@ def p_ruleset(self, p):
 
         selectors = [ p[1] ]
 
-        if isinstance(declarations, css.ruleset):
+        if isinstance(declarations, css.Ruleset):
             selectors.extend(declarations.selectors)
             declarations = declarations.declarations
 
-        p[0] = css.ruleset(selectors, declarations)
+        p[0] = css.Ruleset(selectors, declarations)
 
     def p_ruleset2(self, p):
         '''
@@ -387,7 +390,7 @@ def p_ruleset4(self, p):
                  | ruleset_x
         '''
         p[0] = list()
-        if isinstance(p[1], css.declaration):
+        if isinstance(p[1], css.Declaration):
             p[0].append(p[1])
 
             if len(p) == 4:
@@ -525,7 +528,7 @@ def p_declaration(self, p):
         else:
             value, important = p[3][0], 2 == len(p[3])
 
-        p[0] = css.declaration(p[1],value,important)
+        p[0] = css.Declaration(p[1],value,important)
 
     def p_declaration2(self, p):
         '''
@@ -568,20 +571,20 @@ def p_term(self, p):
              | function
         '''
         if len(p) == 3 and -1 != '-+'.find(p[1]):
-            p[0] = css.term(p[2],p[1])
+            p[0] = css.Term(p[2],p[1])
         else:
             t, val = p.slice[1], p[1]
 
-            if isinstance(val, css.function) or isinstance(val, css.hexcolor):
+            if isinstance(val, css.Function) or isinstance(val, css.Hexcolor):
                 p[0] = val
             elif t.type == 'URI':
                 p[0] = URI_value(val)
             elif t.type == 'IDENT':
-                p[0] = css.ident(val)
+                p[0] = IDENT_value(val)
             elif t.type == 'STRING':
                 p[0] = STRING_value(val)
             else:
-                p[0] = css.term(val)
+                p[0] = css.Term(val)
 
     def p_term_quant(self, p):
         '''
@@ -611,9 +614,9 @@ def p_function(self, p):
         '''
         name = p[1][:-1] # p[1] has a trailing open-paren
         if len(p) == 4:
-            p[0] = css.function(name, p[3])
+            p[0] = css.Function(name, p[3])
         else:
-            p[0] = css.function(name, p[2])
+            p[0] = css.Function(name, p[2])
 
     def p_function2(self, p):
         '''
@@ -627,7 +630,7 @@ def p_hexcolor(self, p):
         hexcolor : HASH S
                  | HASH
         '''
-        p[0] = css.hexcolor(p[1])
+        p[0] = css.Hexcolor(p[1])
 
     def p_error(self, p):
         print "Syntax error at '%r'" % p