NameObject str __init__, .gitignore

py-pdf · Apr 22, 2014 · 8a0f996 · 8a0f996
1 parent 55e8169
commit 8a0f996
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 *.pyc
 *.swp
+.DS_Store
diff --git a/PyPDF2/generic.py b/PyPDF2/generic.py
@@ -447,10 +447,13 @@ def writeToStream(self, stream, encryption_key):
 
 
 class NameObject(str, PdfObject):
-    delimiterCharacters = b_("("), b_(")"), b_("<"), b_(">"), b_("["), b_("]"), b_("{"), b_("}"), b_("/"), b_("%")
+    delimiterCharacters = tuple(b_(c) for c in "()<>[]{}/%")
 
+    # Because of how subclassing str works, x = NameObject("sometext") sets the 
+    # str value before __init__ is called.  An __init__ method isn't needed.
+    # This __init__ is here to add to if more initialization becomes necessary.
     def __init__(self, data):
-        str.__init__(super(NameObject, self).__new__(str, data))
+        pass
 
     def writeToStream(self, stream, encryption_key):
         stream.write(b_(self))