safe names should avoid Python keywords

uproot/__init__.py

@@ -31,6 +31,7 @@
 # high-level entry points
 from uproot.rootio import open, xrootd
 from uproot.tree import iterate
+from uproot.version import version
 
 from uproot.source.memmap import MemmapSource
 from uproot.source.file import FileSource
@@ -42,3 +43,6 @@
 # in the code, and are built programmatically to avoid duplication; Python's
 # inline docstring method doesn't accept non-literals)
 import uproot._help
+
+# don't expose uproot.uproot; it's ugly
+del uproot

uproot/rootio.py

@@ -28,10 +28,11 @@
 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import keyword
+import numbers
 import re
 import struct
 import sys
-import numbers
 try:
     from urlparse import urlparse
 except ImportError:
@@ -524,7 +525,10 @@ def _ftype2struct(fType):
         raise NotImplementedError(fType)
 
 def _safename(name):
-    return re.sub(b"[^a-zA-Z0-9]+", lambda bad: b"_" + b"".join(b"%02x" % ord(x) for x in bad.group(0)) + b"_", name).decode("ascii")
+    out = re.sub(b"[^a-zA-Z0-9]+", lambda bad: b"_" + b"".join(b"%02x" % ord(x) for x in bad.group(0)) + b"_", name).decode("ascii")
+    if keyword.iskeyword(out):
+        out = out + "__"
+    return out
 
 def _raise_notimplemented(streamertype, streamerdict, source, cursor):
     raise NotImplementedError("\n\nUnimplemented streamer type: {0}\n\nmembers: {1}\n\nfile contents:\n\n{2}".format(streamertype, streamerdict, cursor.hexdump(source)))

uproot/version.py

@@ -30,7 +30,7 @@
 
 import re
 
-__version__ = "2.1.0"
+__version__ = "2.1.1"
 version = __version__
 version_info = tuple(re.split(r"[-\.]", __version__))