File upload using remotedriver on python3

remove comment

Fixes Issue #6167

Author: Artur Orlov

py/selenium/webdriver/remote/webelement.py

@@ -18,14 +18,14 @@
 import os
 import zipfile
 try:
-    from StringIO import StringIO
+    from StringIO import StringIO as IOStream
 except ImportError:  # 3+
-    from io import StringIO
+    from io import BytesIO as IOStream
 import base64
 
 
 from .command import Command
-from selenium.common.exceptions import WebDriverException 
+from selenium.common.exceptions import WebDriverException
 from selenium.common.exceptions import InvalidSelectorException
 from selenium.webdriver.common.by import By
 from selenium.webdriver.common.keys import Keys
@@ -69,7 +69,7 @@ def clear(self):
 
     def get_attribute(self, name):
         """Gets the attribute value.
-        
+
         :Args:
             - name - name of the attribute property to retieve.
 
@@ -103,16 +103,16 @@ def is_enabled(self):
 
     def find_element_by_id(self, id_):
         """Finds element within the child elements of this element.
-        
+
         :Args:
             - id_ - ID of child element to locate.
         """
         return self.find_element(by=By.ID, value=id_)
 
     def find_elements_by_id(self, id_):
-        """Finds a list of elements within the children of this element 
+        """Finds a list of elements within the children of this element
         with the matching ID.
-        
+
         :Args:
             - id_ - Id of child element to find.
         """
@@ -127,63 +127,63 @@ def find_element_by_name(self, name):
 
     def find_elements_by_name(self, name):
         """Finds a list of elements with in this element's children by name.
-        
+
         :Args:
             - name - name property to search for.
         """
         return self.find_elements(by=By.NAME, value=name)
 
     def find_element_by_link_text(self, link_text):
         """Finds element with in this element's children by visible link text.
-        
+
         :Args:
             - link_text - Link text string to search for.
         """
         return self.find_element(by=By.LINK_TEXT, value=link_text)
 
     def find_elements_by_link_text(self, link_text):
         """Finds a list of elements with in this element's children by visible link text.
-        
+
         :Args:
             - link_text - Link text string to search for.
         """
         return self.find_elements(by=By.LINK_TEXT, value=link_text)
 
     def find_element_by_partial_link_text(self, link_text):
         """Finds element with in this element's children by parial visible link text.
-        
+
         :Args:
             - link_text - Link text string to search for.
         """
         return self.find_element(by=By.PARTIAL_LINK_TEXT, value=link_text)
 
     def find_elements_by_partial_link_text(self, link_text):
         """Finds a list of elements with in this element's children by link text.
-        
+
         :Args:
             - link_text - Link text string to search for.
         """
         return self.find_elements(by=By.PARTIAL_LINK_TEXT, value=link_text)
 
     def find_element_by_tag_name(self, name):
         """Finds element with in this element's children by tag name.
-        
+
         :Args:
             - name - name of html tag (eg: h1, a, span)
         """
         return self.find_element(by=By.TAG_NAME, value=name)
 
     def find_elements_by_tag_name(self, name):
         """Finds a list of elements with in this element's children by tag name.
-        
+
         :Args:
             - name - name of html tag (eg: h1, a, span)
         """
         return self.find_elements(by=By.TAG_NAME, value=name)
 
     def find_element_by_xpath(self, xpath):
         """Finds element by xpath.
-        
+
         :Args:
             xpath - xpath of element to locate.  "//input[@class='myelement']"
 
@@ -202,7 +202,7 @@ def find_element_by_xpath(self, xpath):
 
     def find_elements_by_xpath(self, xpath):
         """Finds elements within the elements by xpath.
-        
+
         :Args:
             - xpath - xpath locator string.
 
@@ -220,32 +220,32 @@ def find_elements_by_xpath(self, xpath):
 
     def find_element_by_class_name(self, name):
         """Finds an element within this element's children by their class name.
-        
+
         :Args:
             - name - class name to search on.
         """
         return self.find_element(by=By.CLASS_NAME, value=name)
 
     def find_elements_by_class_name(self, name):
         """Finds a list of elements within children of this element by their class name.
-        
+
         :Args:
             - name - class name to search on.
         """
         return self.find_elements(by=By.CLASS_NAME, value=name)
 
     def find_element_by_css_selector(self, css_selector):
         """Find and return an element that's a child of this element by CSS selector.
-        
+
         :Args:
             - css_selector - CSS selctor string, ex: 'a.nav#home'
         """
         return self.find_element(by=By.CSS_SELECTOR, value=css_selector)
 
     def find_elements_by_css_selector(self, css_selector):
-        """Find and return list of multiple elements within the children of this 
+        """Find and return list of multiple elements within the children of this
         element by CSS selector.
-        
+
         :Args:
             - css_selector - CSS selctor string, ex: 'a.nav#home'
         """
@@ -255,19 +255,19 @@ def send_keys(self, *value):
         """Simulates typing into the element.
 
         :Args:
-            - value - A string for typing, or setting form fields.  For setting 
+            - value - A string for typing, or setting form fields.  For setting
             file inputs, this could be a local file path.
 
         Use this to send simple key events or to fill out form fields::
 
             form_textfield = driver.find_element_by_name('username')
             form_textfield.send_keys("admin")
-        
+
         This can also be used to set file inputs.::
 
             file_input = driver.find_element_by_name('profilePic')
             file_input.send_keys("path/to/profilepic.gif")
-            # Generally it's better to wrap the file path in one of the methods 
+            # Generally it's better to wrap the file path in one of the methods
             # in os.path to return the actual path to support cross OS testing.
             # file_input.send_keys(os.path.abspath("path/to/profilepic.gif"))
 
@@ -336,11 +336,11 @@ def parent(self):
 
     @property
     def id(self):
-        """ Returns internal id used by selenium. 
-        
-        This is mainly for internal use.  Simple use cases such as checking if 2 webelements 
+        """ Returns internal id used by selenium.
+
+        This is mainly for internal use.  Simple use cases such as checking if 2 webelements
         refer to the same element, can be done using '=='::
-        
+
             if element1 == element2:
                 print("These 2 are equal")
 
@@ -387,13 +387,16 @@ def __hash__(self):
         return int(hashlib.md5(self._id.encode('utf-8')).hexdigest(), 16)
 
     def _upload(self, filename):
-        fp = StringIO()
+        fp = IOStream()
         zipped = zipfile.ZipFile(fp, 'w', zipfile.ZIP_DEFLATED)
         zipped.write(filename, os.path.split(filename)[1])
         zipped.close()
+        content = base64.encodestring(fp.getvalue())
+        if not isinstance(content, str):
+            content = content.decode('utf-8')
         try:
-            return self._execute(Command.UPLOAD_FILE, 
-                            {'file': base64.encodestring(fp.getvalue())})['value']
+            return self._execute(Command.UPLOAD_FILE,
+                            {'file': content})['value']
         except WebDriverException as e:
             if "Unrecognized command: POST" in e.__str__():
                 return filename