Fixed filter not working for services that require URLEncoded filters

Closes #110

Signed-off-by: Jakub Filak <[email protected]>

Author: bartonip

CHANGELOG.md

@@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+### Fixed
+- URL encode $filter contents - Barton Ip
+
 ## [1.5.0]
 
 ### Added

pyodata/v2/service.py

@@ -14,6 +14,13 @@
 from http.client import HTTPResponse
 from io import BytesIO
 
+try:
+    # For Python 3.0 and later
+    from urllib.parse import quote
+except ImportError:
+    # Fallback to urllib2
+    from urllib2 import quote
+
 from pyodata.exceptions import HttpError, PyODataException, ExpressionError
 from . import model
 
@@ -592,7 +599,7 @@ def expand(self, expand):
     def filter(self, filter_val):
         """Sets the filter expression."""
         # returns QueryRequest
-        self._filter = filter_val
+        self._filter = quote(filter_val)
         return self
 
     # def nav(self, key_value, nav_property):

tests/test_service_v2.py

@@ -1450,7 +1450,7 @@ def test_navigation_count_with_filter(service):
 
     responses.add(
         responses.GET,
-        "{0}/Employees(23)/Addresses/$count?$filter=City eq 'London'".format(service.url),
+        "{0}/Employees(23)/Addresses/$count?%24filter=City%2520eq%2520%2527London%2527".format(service.url),
         json=3,
         status=200)