Skip to content

Commit

Permalink
Version bump introducing speedups
Browse files Browse the repository at this point in the history
  • Loading branch information
Kronuz committed Jan 3, 2012
1 parent a9d98b6 commit b388a60
Show file tree
Hide file tree
Showing 19 changed files with 397 additions and 1,504 deletions.
4 changes: 2 additions & 2 deletions CHANGELOG
Original file line number Original file line Diff line number Diff line change
@@ -1,8 +1,8 @@
Changelog Changelog
========= =========
1.1.1 - ??? 1.1.1 Jan 2, 2012
+ Added optional C module for an amazing boost in scanning speed! + Added optional C module for an amazing boost in scanning speed!
+ Added ``headings``, ``stylesheet-url``, ``font-url``, ``font-files`` and ``inline-font-files``. + Added ``headings``, ``stylesheet-url``, ``font-url``, ``font-files``, ``inline-font-files`` and ``sprite-names``.


1.1.0 - Dec 22, 2011 1.1.0 - Dec 22, 2011
+ Added min() and max() for lists. + Added min() and max() for lists.
Expand Down
14 changes: 0 additions & 14 deletions MANIFEST

This file was deleted.

2 changes: 2 additions & 0 deletions MANIFEST.in
Original file line number Original file line Diff line number Diff line change
@@ -0,0 +1,2 @@
include DESCRIPTION LICENSE CHANGELOG README.rst
recursive-include scss *
4 changes: 2 additions & 2 deletions pyScss.egg-info/PKG-INFO
Original file line number Original file line Diff line number Diff line change
@@ -1,12 +1,12 @@
Metadata-Version: 1.0 Metadata-Version: 1.0
Name: pyScss Name: pyScss
Version: 1.1.0 Version: 1.1.1
Summary: pyScss, a Scss compiler for Python Summary: pyScss, a Scss compiler for Python
Home-page: http://github.com/Kronuz/pyScss Home-page: http://github.com/Kronuz/pyScss
Author: German M. Bravo (Kronuz) Author: German M. Bravo (Kronuz)
Author-email: german.mb@gmail.com Author-email: german.mb@gmail.com
License: MIT License: MIT
Download-URL: http://github.com/Kronuz/pyScss/tarball/v1.1.0 Download-URL: http://github.com/Kronuz/pyScss/tarball/v1.1.1
Description: pyScss, a Scss compiler for Python Description: pyScss, a Scss compiler for Python
================================== ==================================
:Author: :Author:
Expand Down
26 changes: 24 additions & 2 deletions pyScss.egg-info/SOURCES.txt
Original file line number Original file line Diff line number Diff line change
@@ -1,13 +1,35 @@
CHANGELOG
DESCRIPTION DESCRIPTION
LICENSE LICENSE
MANIFEST MANIFEST.in
README.rst README.rst
setup.py setup.py
pyScss.egg-info/PKG-INFO pyScss.egg-info/PKG-INFO
pyScss.egg-info/SOURCES.txt pyScss.egg-info/SOURCES.txt
pyScss.egg-info/dependency_links.txt pyScss.egg-info/dependency_links.txt
pyScss.egg-info/entry_points.txt pyScss.egg-info/entry_points.txt
pyScss.egg-info/top_level.txt pyScss.egg-info/top_level.txt
scss/.DS_Store
scss/__init__.py scss/__init__.py
scss/__init__.pyc
scss/scss_meta.py scss/scss_meta.py
scss/src/_scss.c scss/scss_meta.pyc
scss/setup.py
scss/tests.rst
scss/src/.DS_Store
scss/src/_scss.c
scss/src/block_locator.c
scss/src/block_locator.h
scss/src/block_locator.py
scss/src/build.py
scss/src/scanner.c
scss/src/scanner.h
scss/src/scanner.py
scss/src/utils.h
scss/src/grammar/LICENSE
scss/src/grammar/README
scss/src/grammar/grammar.g
scss/src/grammar/grammar.py
scss/src/grammar/yapps2.py
scss/src/grammar/yappsrt.py
scss/src/grammar/yappsrt.pyc
6 changes: 3 additions & 3 deletions pyScss.egg-info/entry_points.txt
Original file line number Original file line Diff line number Diff line change
@@ -1,4 +1,4 @@


[console_scripts] [console_scripts]
pyscss = scss:main pyscss = scss:main

13 changes: 7 additions & 6 deletions scss/__init__.py
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
pyScss, a Scss compiler for Python pyScss, a Scss compiler for Python
@author German M. Bravo (Kronuz) <german.mb@gmail.com> @author German M. Bravo (Kronuz) <german.mb@gmail.com>
@version 1.0 @version 1.1.1
@see https://github.com/Kronuz/pyScss @see https://github.com/Kronuz/pyScss
@copyright (c) 2011 German M. Bravo (Kronuz) @copyright (c) 2012 German M. Bravo (Kronuz)
@license MIT License @license MIT License
http://www.opensource.org/licenses/mit-license.php http://www.opensource.org/licenses/mit-license.php
Expand Down Expand Up @@ -80,9 +80,9 @@
locate_blocks = None locate_blocks = None
Scanner = None Scanner = None
try: try:
from _scss import locate_blocks, Scanner, NoMoreTokens from _speedups import locate_blocks, Scanner, NoMoreTokens
except ImportError: except ImportError:
print >>sys.stderr, "Scanning acceleration disabled (_scss not found)!" print >>sys.stderr, "Scanning acceleration disabled (_speedups not found)!"
pass pass


################################################################################ ################################################################################
Expand Down Expand Up @@ -4396,6 +4396,7 @@ def __radd__(self, other):
'image-color:2': _image_color, 'image-color:2': _image_color,
'image-color:3': _image_color, 'image-color:3': _image_color,
'sprite-map:1': _sprite_map, 'sprite-map:1': _sprite_map,
'sprite-names:1': _sprites,
'sprites:1': _sprites, 'sprites:1': _sprites,
'sprite:2': _sprite, 'sprite:2': _sprite,
'sprite:3': _sprite, 'sprite:3': _sprite,
Expand Down Expand Up @@ -4851,14 +4852,14 @@ class CalculatorScanner(CachedScanner):
('ID', '[-a-zA-Z_][-a-zA-Z0-9_]*'), ('ID', '[-a-zA-Z_][-a-zA-Z0-9_]*'),
] ]


def __init__(self): def __init__(self, input=None):
if hasattr(self, 'setup_patterns'): if hasattr(self, 'setup_patterns'):
self.setup_patterns(self._patterns) self.setup_patterns(self._patterns)
elif self.patterns is None: elif self.patterns is None:
self.__class__.patterns = [] self.__class__.patterns = []
for t, p in self._patterns: for t, p in self._patterns:
self.patterns.append((t, re.compile(p))) self.patterns.append((t, re.compile(p)))
Scanner.__init__(self, None, ['[ \r\t\n]+']) super(CalculatorScanner, self).__init__(None, ['[ \r\t\n]+'], input)




class Calculator(Parser): class Calculator(Parser):
Expand Down
144 changes: 0 additions & 144 deletions scss/_scss_c/__init__.py

This file was deleted.

Loading

0 comments on commit b388a60

Please sign in to comment.