--- a/piecrust/baking/single.py	Fri Mar 27 20:47:31 2015 -0700
+++ b/piecrust/baking/single.py	Sat Mar 28 12:41:02 2015 -0700
@@ -2,9 +2,7 @@
 import shutil
 import codecs
 import logging
-import urllib.error
 import urllib.parse
-import urllib.request
 from piecrust.baking.records import FLAG_OVERRIDEN, FLAG_SOURCE_MODIFIED
 from piecrust.data.filters import (PaginationFilter, HasFilterClause,
         IsFilterClause, AndBooleanClause,

--- a/piecrust/data/paginator.py	Fri Mar 27 20:47:31 2015 -0700
+++ b/piecrust/data/paginator.py	Sat Mar 28 12:41:02 2015 -0700
@@ -212,7 +212,7 @@
     def _getPageUri(self, index):
         uri = self._uri
         if index > 1:
-            if not uri.endswith('/'):
+            if len(uri) > 0 and not uri.endswith('/'):
                 uri += '/'
             uri += str(index)
         return uri

--- a/tests/test_data_assetor.py	Fri Mar 27 20:47:31 2015 -0700
+++ b/tests/test_data_assetor.py	Sat Mar 28 12:41:02 2015 -0700
@@ -67,6 +67,7 @@
     app.env = MagicMock()
     app.env.base_asset_url_format = url_format
     app.config = {
+            'site/root': '/',
             'site/pretty_urls': pretty_urls}
     assets_path = 'foo/bar-assets'
     actual = build_base_url(app, uri, assets_path)

--- a/tests/test_uriutil.py	Fri Mar 27 20:47:31 2015 -0700
+++ b/tests/test_uriutil.py	Sat Mar 28 12:41:02 2015 -0700
@@ -1,6 +1,6 @@
 import mock
 import pytest
-from piecrust.uriutil import UriInfo, parse_uri, get_first_sub_uri
+from piecrust.uriutil import UriInfo, parse_uri, split_sub_uri
 
 
 @pytest.mark.parametrize('routes, uri, expected', [
@@ -27,20 +27,20 @@
 
 
 @pytest.mark.parametrize('uri, expected, pretty_urls', [
-    ('foo/bar', 'foo/bar', True),
-    ('foo/bar/2', 'foo/bar', True),
-    ('foo/bar.ext', 'foo/bar.ext', True),
-    ('foo/bar.ext/2', 'foo/bar.ext', True),
-    ('foo/bar.html', 'foo/bar.html', False),
-    ('foo/bar/2.html', 'foo/bar.html', False),
-    ('foo/bar.ext', 'foo/bar.ext', False),
-    ('foo/bar/2.ext', 'foo/bar.ext', False)
+    ('foo/bar', ('foo/bar', 1), True),
+    ('foo/bar/2', ('foo/bar', 2), True),
+    ('foo/bar.ext', ('foo/bar.ext', 1), True),
+    ('foo/bar.ext/2', ('foo/bar.ext', 2), True),
+    ('foo/bar.html', ('foo/bar.html', 1), False),
+    ('foo/bar/2.html', ('foo/bar.html', 2), False),
+    ('foo/bar.ext', ('foo/bar.ext', 1), False),
+    ('foo/bar/2.ext', ('foo/bar.ext', 2), False)
     ])
-def test_get_first_sub_uri(uri, expected, pretty_urls):
+def test_split_sub_uri(uri, expected, pretty_urls):
     app = mock.MagicMock()
     app.config = {
             'site/pretty_urls': pretty_urls,
-            '__cache/pagination_suffix_re': '/(\\d+)$'}
-    actual = get_first_sub_uri(app, uri)
+            '__cache/pagination_suffix_re': '/(?P<num>\\d+)$'}
+    actual = split_sub_uri(app, uri)
     assert actual == expected