Merge branch 'master' of https://github.com/nickspring/ebaysdk-python

Conflicts: ebaysdk/.DS_Store
timotheus · Jan 24, 2015 · 405a1c1 · 405a1c1
2 parents 49f4b26 + 19ed80f
commit 405a1c1
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/ebaysdk/connection.py b/ebaysdk/connection.py
@@ -141,7 +141,6 @@ def build_request(self, verb, data, verb_attrs):
         headers = self.build_request_headers(verb)
         headers.update({'User-Agent': UserAgent, 
                         'X-EBAY-SDK-REQUEST-ID': str(self._request_id)})
-
         request = Request(self.method, 
             url,
             data=self.build_request_data(verb, data, verb_attrs),

diff --git a/ebaysdk/utils.py b/ebaysdk/utils.py
@@ -23,7 +23,7 @@ def python_2_unicode_compatible(klass):
                              "to %s because it doesn't define __str__()." %
                              klass.__name__)
         klass.__unicode__ = klass.__str__
-        klass.__str__ = lambda self: self.__unicode__().encode('utf-8')
+        klass.__str__ = lambda self: self.__unicode__().encode('utf-8', 'ignore')
     return klass
 
 def get_dom_tree(xml):
@@ -46,7 +46,7 @@ def attribute_check(root):
 def smart_encode(value):
     try:
         if sys.version_info[0] < 3:
-            return unicode(value).encode('utf-8')
+            return unicode(value).encode('utf-8', 'ignore')
         else:
             return value
             #return str(value)