From 91770edd4695ff4bafb446ed24fa1a3be5dd062f Mon Sep 17 00:00:00 2001
From: "yusuke.shinyama.dummy"
 <yusuke.shinyama.dummy@1aa58f4a-7d42-0410-adbc-911cccaed67c>
Date: Sat, 10 Jan 2009 09:25:03 +0000
Subject: [PATCH] foo

git-svn-id: https://pdfminerr.googlecode.com/svn/trunk/pdfminer@59 1aa58f4a-7d42-0410-adbc-911cccaed67c
---
 pdflib/pdf2txt.py   | 6 +++---
 pdflib/pdfdevice.py | 4 ++--
 pdflib/pdffont.py   | 3 +--
 pdflib/pdftypes.py  | 2 +-
 tools/dumppdf.py    | 4 ++--
 5 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/pdflib/pdf2txt.py b/pdflib/pdf2txt.py
index 59071ef..43f6378 100755
--- a/pdflib/pdf2txt.py
+++ b/pdflib/pdf2txt.py
@@ -4,9 +4,9 @@ stdout = sys.stdout
 stderr = sys.stderr
 from pdflib.pdfparser import PDFDocument, PDFParser, PDFPasswordIncorrect
 from pdflib.pdfinterp import PDFResourceManager, PDFPageInterpreter
+from pdflib.pdfdevice import PDFDevice, FigureItem, TextItem, PDFPageAggregator
 from pdflib.pdffont import PDFUnicodeNotDefined
 from pdflib.cmap import CMapDB
-from pdflib.page import PDFDevice, PageItem, FigureItem, TextItem, PageAggregator
 
 
 def enc(x, codec):
@@ -19,10 +19,10 @@ def encprops(props, codec):
 
 
 ##  TextConverter
-class TextConverter(PageAggregator):
+class TextConverter(PDFPageAggregator):
   
   def __init__(self, rsrc, outfp, codec='ascii'):
-    PageAggregator.__init__(self, rsrc)
+    PDFPageAggregator.__init__(self, rsrc)
     self.outfp = outfp
     self.codec = codec
     return
diff --git a/pdflib/pdfdevice.py b/pdflib/pdfdevice.py
index b8f5514..df5c304 100644
--- a/pdflib/pdfdevice.py
+++ b/pdflib/pdfdevice.py
@@ -142,9 +142,9 @@ class TextItem(object):
             (self.matrix, self.font, self.fontsize, self.bbox, self.text, self.adv))
 
 
-##  PageAggregator
+##  PDFPageAggregator
 ##
-class PageAggregator(PDFDevice):
+class PDFPageAggregator(PDFDevice):
 
   def __init__(self, rsrc, pageno=1):
     PDFDevice.__init__(self, rsrc)
diff --git a/pdflib/pdffont.py b/pdflib/pdffont.py
index 3dd0089..30f6c1d 100644
--- a/pdflib/pdffont.py
+++ b/pdflib/pdffont.py
@@ -225,8 +225,7 @@ class TrueTypeFont(object):
               char2gid[c] = (c + idd) & 0xffff
     gid2char = dict( (gid, pack('>H', char))
                      for (char,gid) in char2gid.iteritems() )
-    cmapname = 'Adobe-Identity-UCS-%s' % self.name
-    return CMap(cmapname).update(char2gid, gid2char)
+    return CMap().update(char2gid, gid2char)
 
 class PDFCIDFont(PDFFont):
   
diff --git a/pdflib/pdftypes.py b/pdflib/pdftypes.py
index c13a763..69db608 100644
--- a/pdflib/pdftypes.py
+++ b/pdflib/pdftypes.py
@@ -186,7 +186,7 @@ class PDFStream(PDFObject):
         import ascii85
         data = ascii85.ascii85decode(data)
       elif f == LITERAL_CRYPT:
-        raise PDFEncryptionError('/Crypt filter is unsupported')
+        raise PDFNotImplementedError('/Crypt filter is unsupported')
       else:
         raise PDFNotImplementedError('Unsupported filter: %r' % f)
       # apply predictors
diff --git a/tools/dumppdf.py b/tools/dumppdf.py
index b385980..4bad243 100755
--- a/tools/dumppdf.py
+++ b/tools/dumppdf.py
@@ -7,8 +7,8 @@
 #    -i objid : object id
 #
 import sys, re
-from pdflib.pdfparser import PDFDocument, PDFParser, PDFStream, \
-     PDFObjRef, PSKeyword, PSLiteral, resolve1
+from pdflib.pdfparser import PDFDocument, PDFParser
+from pdflib.pdftypes import PDFStream, PDFObjRef, PSKeyword, PSLiteral, resolve1
 stdout = sys.stdout
 stderr = sys.stderr