From: Stefan Behnel <stefan_ml@behnel.de>
Date: Sun, 3 Nov 2013 17:18:02 +0000 (+0100)
Subject: avoid useless lookup of unknown encoding (fixes compiler crash)
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4d5c1c4ee88e34d504bf452a5797649cc7c8c9b9;p=platform%2Fupstream%2Fpython-cython.git

avoid useless lookup of unknown encoding (fixes compiler crash)
---

diff --git a/Cython/Compiler/Optimize.py b/Cython/Compiler/Optimize.py
index d7c9bd7..9b5347b 100644
--- a/Cython/Compiler/Optimize.py
+++ b/Cython/Compiler/Optimize.py
@@ -2709,7 +2709,7 @@ class OptimizeBuiltinCalls(Visitor.MethodDispatcherTransform):
             return node
         encoding, encoding_node, error_handling, error_handling_node = parameters
 
-        if isinstance(string_node, ExprNodes.UnicodeNode):
+        if encoding and isinstance(string_node, ExprNodes.UnicodeNode):
             # constant, so try to do the encoding at compile time
             try:
                 value = string_node.value.encode(encoding, error_handling)
@@ -2722,7 +2722,7 @@ class OptimizeBuiltinCalls(Visitor.MethodDispatcherTransform):
                 return ExprNodes.BytesNode(
                     string_node.pos, value=value, type=Builtin.bytes_type)
 
-        if error_handling == 'strict':
+        if encoding and error_handling == 'strict':
             # try to find a specific encoder function
             codec_name = self._find_special_codec_name(encoding)
             if codec_name is not None: