Fix: work around windows: it has a 2 char next line sequence

CHANGES.txt

@@ -8,6 +8,8 @@ CHANGES
 - Made tests compatible with ``zope.browserresource`` 3.11, thus requiring
   at least this version.
 
+- Fix: work around windows: it has a 2 char next line sequence
+
 
 1.3.0 (2009-08-27)
 ------------------

src/z3c/zrtresource/README.txt

@@ -325,3 +325,27 @@ utilities).
     background: url('../img2/mybackground.gif');
   }
   <BLANKLINE>
+
+Edge case
+---------
+
+On windows blank lines were left in the result
+
+  >>> open(fn, 'w').write('''\
+  ... some-head
+  ... /* zrt-replace: "../img1" "++resource++/img" */
+  ... /* zrt-replace: "fontName" "Arial, Tahoma" */
+  ... some-in-the-middle
+  ... /* zrt-replace: "../img2" "++resource++/img" */
+  ... some-at-the-end
+  ... ''')
+
+  >>> cssFactory = ZRTFileResourceFactory(fn, None, 'site.css')
+
+  >>> from zope.publisher.browser import TestRequest
+  >>> css = cssFactory(TestRequest())
+
+and render the resource:
+
+  >>> css.GET().splitlines()
+  ['some-head', 'some-in-the-middle', 'some-at-the-end']

src/z3c/zrtresource/processor.py

@@ -50,13 +50,18 @@ def compile(self):
         # Regular Expression to find commands.
         regex = re.compile(COMMAND_REGEX %(self.commandStartRegex,
                                            self.commandEndRegex))
+        nextlinelen = 1
+        if '\r\n' in self.source:
+            # work around windows: it has a 2 char next line sequence
+            nextlinelen = 2
+
         # Find all commands
         for match in regex.finditer(self.source):
             command, args = match.groups()
 
             # Add the previous text block and update position
             bytecode.append((TEXTBLOCK, self.source[pos:match.start()]))
-            pos = match.end() + 1
+            pos = match.end() + nextlinelen
 
             # Make sure the command exists
             if command not in self.commands: