Replace .replace(' ', NBSP) call with self.escape call

Dividers need to be escaped as well.

Fixes #1027

powerline/renderer.py

@@ -385,7 +385,7 @@ class Renderer(object):
 
 			# Pad segments first
 			if draw_divider:
-				divider_raw = theme.get_divider(side, divider_type).replace(' ', NBSP)
+				divider_raw = self.escape(theme.get_divider(side, divider_type))
 				if side == 'left':
 					contents_raw = (
 						outer_padding + (segment['_space_left'] * ' ')

tests/test_shells/bash.daemon.ok

@@ -25,4 +25,5 @@ def
   BRANCH  ⋯  shell  3rd  #[bold]  cd ../'(echo)'
   BRANCH  ⋯  shell  3rd  (echo)  cd ../'$(echo)'
   BRANCH  ⋯  shell  3rd  $(echo)  cd ../'`echo`'
-  BRANCH  ⋯  shell  3rd  `echo`  false
+  BRANCH  ⋯  shell  3rd  `echo`  POWERLINE_COMMAND="$POWERLINE_COMMAND -t default_leftonly.dividers.left.hard=\$ABC"
+  BRANCH $ABC⋯  shell  3rd  `echo` $ABCfalse

tests/test_shells/bash.nodaemon.ok

@@ -25,4 +25,5 @@ def
   BRANCH  ⋯  shell  3rd  #[bold]  cd ../'(echo)'
   BRANCH  ⋯  shell  3rd  (echo)  cd ../'$(echo)'
   BRANCH  ⋯  shell  3rd  $(echo)  cd ../'`echo`'
-  BRANCH  ⋯  shell  3rd  `echo`  false
+  BRANCH  ⋯  shell  3rd  `echo`  POWERLINE_COMMAND="$POWERLINE_COMMAND -t default_leftonly.dividers.left.hard=\$ABC"
+  BRANCH $ABC⋯  shell  3rd  `echo` $ABCfalse

tests/test_shells/busybox.daemon.ok

@@ -24,4 +24,5 @@ def
   BRANCH  ⋯  shell  3rd  #[bold]  cd ../'(echo)'
   BRANCH  ⋯  shell  3rd  (echo)  cd ../'$(echo)'
   BRANCH  ⋯  shell  3rd  $(echo)  cd ../'`echo`'
-  BRANCH  ⋯  shell  3rd  `echo`  false
+  BRANCH  ⋯  shell  3rd  `echo`  POWERLINE_COMMAND="$POWERLINE_COMMAND -t default_leftonly.dividers.left.hard=\$ABC"
+  BRANCH $ABC⋯  shell  3rd  `echo` $ABCfalse

tests/test_shells/busybox.nodaemon.ok

@@ -24,4 +24,5 @@ def
   BRANCH  ⋯  shell  3rd  #[bold]  cd ../'(echo)'
   BRANCH  ⋯  shell  3rd  (echo)  cd ../'$(echo)'
   BRANCH  ⋯  shell  3rd  $(echo)  cd ../'`echo`'
-  BRANCH  ⋯  shell  3rd  `echo`  false
+  BRANCH  ⋯  shell  3rd  `echo`  POWERLINE_COMMAND="$POWERLINE_COMMAND -t default_leftonly.dividers.left.hard=\$ABC"
+  BRANCH $ABC⋯  shell  3rd  `echo` $ABCfalse

tests/test_shells/dash.daemon.ok

@@ -23,4 +23,5 @@ def
   BRANCH  ⋯  shell  3rd  #[bold]  cd ../'(echo)'
   BRANCH  ⋯  shell  3rd  (echo)  cd ../'$(echo)'
   BRANCH  ⋯  shell  3rd  $(echo)  cd ../'`echo`'
-  BRANCH  ⋯  shell  3rd  `echo`  false
+  BRANCH  ⋯  shell  3rd  `echo`  POWERLINE_COMMAND="$POWERLINE_COMMAND -t default_leftonly.dividers.left.hard=\$ABC"
+  BRANCH $ABC⋯  shell  3rd  `echo` $ABCfalse

tests/test_shells/dash.nodaemon.ok

@@ -23,4 +23,5 @@ def
   BRANCH  ⋯  shell  3rd  #[bold]  cd ../'(echo)'
   BRANCH  ⋯  shell  3rd  (echo)  cd ../'$(echo)'
   BRANCH  ⋯  shell  3rd  $(echo)  cd ../'`echo`'
-  BRANCH  ⋯  shell  3rd  `echo`  false
+  BRANCH  ⋯  shell  3rd  `echo`  POWERLINE_COMMAND="$POWERLINE_COMMAND -t default_leftonly.dividers.left.hard=\$ABC"
+  BRANCH $ABC⋯  shell  3rd  `echo` $ABCfalse

tests/test_shells/input.bash

@@ -25,6 +25,7 @@ cd ../'#[bold]'
 cd ../'(echo)'
 cd ../'$(echo)'
 cd ../'`echo`'
+POWERLINE_COMMAND="$POWERLINE_COMMAND -t default_leftonly.dividers.left.hard=\$ABC"
 false
 true is the last line
 exit

tests/test_shells/input.busybox

@@ -25,6 +25,7 @@ cd ../'#[bold]'
 cd ../'(echo)'
 cd ../'$(echo)'
 cd ../'`echo`'
+POWERLINE_COMMAND="$POWERLINE_COMMAND -t default_leftonly.dividers.left.hard=\$ABC"
 false
 true is the last line
 exit

tests/test_shells/input.dash

@@ -25,6 +25,7 @@ cd ../'#[bold]'
 cd ../'(echo)'
 cd ../'$(echo)'
 cd ../'`echo`'
+POWERLINE_COMMAND="$POWERLINE_COMMAND -t default_leftonly.dividers.left.hard=\$ABC"
 false
 true is the last line
 exit

tests/test_shells/input.mksh

@@ -26,6 +26,7 @@ cd ../'#[bold]'
 cd ../'(echo)'
 cd ../'$(echo)'
 cd ../'`echo`'
+POWERLINE_COMMAND="$POWERLINE_COMMAND -t default_leftonly.dividers.left.hard=\$ABC"
 false
 true is the last line
 exit

tests/test_shells/input.zsh

@@ -40,6 +40,7 @@ do
 done
 1
 hash -d foo=$PWD:h ; cd .
+POWERLINE_COMMAND=( $POWERLINE_COMMAND -t default.dividers.left.hard=\$ABC )
 true
 true is the last line
 exit

tests/test_shells/ipython.ok

@@ -1,14 +1,14 @@
 
- In [2]  bool 42
-     2>  bool(42)
- Out[2]  True
+ In [2]  bool 42
+     2>  bool(42)
+ Out[2]  True
 
- In [3]  bool 44
-     3>  bool(44)
- Out[3]  True
+ In [3]  bool 44
+     3>  bool(44)
+ Out[3]  True
 
- In [4]  class Test(object):
-             pass
-         
+ In [4]  class Test(object):
+             pass
+         
 
- In [5]  exit
+ In [5]  exit

tests/test_shells/mksh.daemon.ok

@@ -27,4 +27,5 @@ def
   BRANCH  ⋯  shell  3rd  #[bold]  cd ../'(echo)'
   BRANCH  ⋯  shell  3rd  (echo)  cd ../'$(echo)'
   BRANCH  ⋯  shell  3rd  $(echo)  cd ../'`echo`'
-  BRANCH  ⋯  shell  3rd  `echo`  false
+  BRANCH  ⋯  shell  3rd  `echo`  POWERLINE_COMMAND="$POWERLINE_COMMAND -t default_leftonly.dividers.left.hard=\$ABC"
+  BRANCH $ABC⋯  shell  3rd  `echo` $ABCfalse

tests/test_shells/mksh.nodaemon.ok

@@ -27,4 +27,5 @@ def
   BRANCH  ⋯  shell  3rd  #[bold]  cd ../'(echo)'
   BRANCH  ⋯  shell  3rd  (echo)  cd ../'$(echo)'
   BRANCH  ⋯  shell  3rd  $(echo)  cd ../'`echo`'
-  BRANCH  ⋯  shell  3rd  `echo`  false
+  BRANCH  ⋯  shell  3rd  `echo`  POWERLINE_COMMAND="$POWERLINE_COMMAND -t default_leftonly.dividers.left.hard=\$ABC"
+  BRANCH $ABC⋯  shell  3rd  `echo` $ABCfalse

tests/test_shells/zsh.daemon.ok

@@ -34,4 +34,5 @@ abc
                    Select variant  1
 def
  INSERT  ⋯  tests  shell  3rd  hash -d foo=$PWD:h ; cd .
- INSERT  ~foo  3rd  true
+ INSERT  ~foo  3rd  POWERLINE_COMMAND=( $POWERLINE_COMMAND -t default.dividers.left.hard=\$ABC )
+ INSERT $ABC~foo  3rd $ABCtrue

tests/test_shells/zsh.nodaemon.ok

@@ -34,4 +34,5 @@ abc
  Select variant  1
 def
  INSERT  ⋯  tests  shell  3rd  hash -d foo=$PWD:h ; cd .
- INSERT  ~foo  3rd  true
+ INSERT  ~foo  3rd  POWERLINE_COMMAND=( $POWERLINE_COMMAND -t default.dividers.left.hard=\$ABC )
+ INSERT $ABC~foo  3rd $ABCtrue