Merge pull request #47 from pygraphviz/html-xlabel

Handle 'xlabel' attribute like 'label'
pygraphviz · Feb 23, 2015 · 5ca3f97 · 5ca3f97
2 parents d97a503 + 2521fe2
commit 5ca3f97
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/pygraphviz/graphviz.i b/pygraphviz/graphviz.i
@@ -204,7 +204,7 @@ int      agsafeset(void *obj, char *name, char *value, char *def);
     int len;
     char *hs;
 
-    if (val[0] == '<' && strcmp(name, "label") == 0) {
+    if (val[0] == '<' && (strcmp(name, "label") == 0 || strcmp(name, "xlabel") == 0)) {
         len = strlen(val);
         if (val[len-1] == '>') {
             hs = strdup(val+1);
@@ -227,7 +227,7 @@ int      agsafeset(void *obj, char *name, char *value, char *def);
     int len;
     char *hs;
 
-    if (val[0] == '<' && strcmp(name, "label") == 0) {
+    if (val[0] == '<' && (strcmp(name, "label") == 0 || strcmp(name, "xlabel") == 0)) {
         len = strlen(val);
         if (val[len-1] == '>') {
             hs = strdup(val+1);

diff --git a/pygraphviz/graphviz.py b/pygraphviz/graphviz.py
@@ -11,16 +11,15 @@
 from sys import version_info
 if version_info >= (2,6,0):
     def swig_import_helper():
-        from os.path import dirname, join
+        from os.path import dirname
         import imp
-        import site
+        fp = None
         try:
-            fp, pathname, description = imp.find_module('_graphviz', list(site._init_pathinfo()) +
-                [dirname(__file__), join(dirname(__file__),'pyvizgraph')])
+            fp, pathname, description = imp.find_module('_graphviz', [dirname(__file__)])
         except ImportError:
             import _graphviz
             return _graphviz
-        if fp:
+        if fp is not None:
             try:
                 _mod = imp.load_module('_graphviz', fp, pathname, description)
             finally:

diff --git a/pygraphviz/graphviz_wrap.c b/pygraphviz/graphviz_wrap.c
@@ -3291,7 +3291,7 @@ SWIG_FromCharPtr(const char *cptr)
     int len;
     char *hs;
 
-    if (val[0] == '<' && strcmp(name, "label") == 0) {
+    if (val[0] == '<' && (strcmp(name, "label") == 0 || strcmp(name, "xlabel") == 0)) {
         len = strlen(val);
         if (val[len-1] == '>') {
             hs = strdup(val+1);
@@ -3309,7 +3309,7 @@ SWIG_FromCharPtr(const char *cptr)
     int len;
     char *hs;
 
-    if (val[0] == '<' && strcmp(name, "label") == 0) {
+    if (val[0] == '<' && (strcmp(name, "label") == 0 || strcmp(name, "xlabel") == 0)) {
         len = strlen(val);
         if (val[len-1] == '>') {
             hs = strdup(val+1);