Commits

Ronald Oussoren committed 11d3da8 Merge

merge

Comments (0)

Files changed (4)

 7a6ccc0c01320eeafcd7dd2dd72c8c9d0512e131 modulegraph-0.10.1
 d50e241095ddfe1ba3b965bb231b39cd8d4a51d6 modulegraph-0.10.2
 2279de99d2acba3428771731a979811d3a840966 modulegraph-0.10.3
+2564678b907aacc164006e316f1a7cce7118a819 modulegraph-0.10.4

doc/changelog.rst

 
 This is a bugfix release
 
+* There were no 'classifiers' in the package metadata due to a bug
+  in setup.py.
+
 0.10.3
 ------
 

modulegraph/find_modules.py

         "cStringIO":    ["copy_reg"],
         "_sre":         ["copy", "string", "sre"],
         "zipimport":    ["zlib"],
+
+        # Python 3.2:
+        "_datetime":    ["time", "_strptime"],
+        "_json":        ["json.decoder"],
+        "_pickle":      ["codecs", "copyreg", "_compat_pickle"],
+        "_posixsubprocess": ["gc"],
+        "_ssl":         ["socket"],
+
+        # Python 3.3:
+        "_elementtree": ["copy", "xml.etree.ElementPath" ],
+
         # mactoolboxglue can do a bunch more of these
         # that are far harder to predict, these should be tracked
         # manually for now.
         "anydbm":       ["dbhash", "gdbm", "dbm", "dumbdbm", "whichdb"],
         # package aliases
         "wxPython.wx":  Alias('wx'),
+
     }
 
+    if sys.version_info[0] == 2 and sys.version_info[1] >= 5:
+        result.update({
+            "email.base64mime":         Alias("email.base64MIME"),
+            "email.charset":            Alias("email.Charset"),
+            "email.encoders":           Alias("email.Encoders"),
+            "email.errors":             Alias("email.Errors"),
+            "email.feedparser":         Alias("email.FeedParser"),
+            "email.generator":          Alias("email.Generator"),
+            "email.header":             Alias("email.Header"),
+            "email.iterators":          Alias("email.Iterators"),
+            "email.message":            Alias("email.Message"),
+            "email.parser":             Alias("email.Parser"),
+            "email.quoprimime":         Alias("email.quopriMIME"),
+            "email.utils":              Alias("email.Utils"),
+            "email.mime.audio":         Alias("email.MIMEAudio"),
+            "email.mime.base":          Alias("email.MIMEBase"),
+            "email.mime.image":         Alias("email.MIMEImage"),
+            "email.mime.message":       Alias("email.MIMEMessage"),
+            "email.mime.multipart":     Alias("email.MIMEMultipart"),
+            "email.mime.nonmultipart":  Alias("email.MIMENonMultipart"),
+            "email.mime.text":          Alias("email.MIMEText"),
+        })
+
+
     if sys.version_info[:2] >= (2, 5):
         result["_elementtree"] = ["pyexpat"]
 
 def _as_lines(value):
     result = []
     for v in value.splitlines():
-        if ';' in value:
+        if ';' in v:
             v, marker = v.rsplit(';', 1)
             if not eval_marker(marker):
                 continue
             v = v.strip()
             if v:
                 result.append(v)
+        else:
+            result.append(v)
     return result
 
 def _map_requirement(value):