Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Added optional OrderedDict package to fix Python 2.4, 2.5 compatibility.

  • Loading branch information...
commit 1c75cf254b12a91761eb0a40922288a88d11b09e 1 parent a58739f
@pansapiens pansapiens authored
View
7 inmembrane/plugins/lipop_scrape_web.py
@@ -14,7 +14,12 @@
from StringIO import StringIO
from BeautifulSoup import BeautifulSoup
import requests
-from collections import OrderedDict
+
+try:
+ from collections import OrderedDict
+except:
+ from ordereddict import OrderedDict
+
import inmembrane
from inmembrane.plugins.lipop1 import parse_lipop
from inmembrane.helpers import log_stderr
View
7 inmembrane/plugins/tmhmm_scrape_web.py
@@ -13,7 +13,12 @@
from StringIO import StringIO
from BeautifulSoup import BeautifulSoup
import requests
-from collections import OrderedDict
+
+try:
+ from collections import OrderedDict
+except:
+ from ordereddict import OrderedDict
+
import inmembrane
from inmembrane.plugins.tmhmm import parse_tmhmm
from inmembrane.helpers import log_stderr
View
7 setup.py
@@ -7,6 +7,11 @@
AUTHOR_EMAIL = "ajperry@pansapiens.com"
URL = "http://github.com/boscoh/inmembrane"
VERSION = __import__(PACKAGE).__version__
+try:
+ extra_requires = []
+ from collections import OrderedDict
+except:
+ extra_requires.append("ordereddict")
setup(
name=PACKAGE,
@@ -30,7 +35,7 @@
"BeautifulSoup >= 3.2.1",
"twill >= 0.9",
"requests >= 0.14.2",
- ],
+ ] + extra_requires,
classifiers=[
"Development Status :: 5 - Production/Stable",
"Environment :: Console",
Please sign in to comment.
Something went wrong with that request. Please try again.