public inbox for [email protected]  

help / color / mirror / Atom feed

From: Azad Salahlı <[email protected]>
To: [email protected]
Subject: [pgAdmin] Fix incorrect import in setup.py
Date: Thu, 24 Sep 2020 04:01:46 -0400
Message-ID: <CA+xqhcXzr-iSA5SDsKN5MbgC6i+AM-hRb5Pt+QjSaS20cRgEZg@mail.gmail.com> (raw)

Hi,

First time posting here. I've attached a fix for an incorrect import
in `setup.py`. Trying to import from `pgadmin` before adding the root
directory to the system path results in import error, when the script
is invoked in any other way than running it directly. For example

    $ /path/to/venv/bin/pip install pgadmin4
    $ /path/to/venv/bin/python -m pgadmin4.setup
    Traceback (most recent call last):
      ...
      File "/path/to/venv/lib/python3.6/site-packages/pgadmin4/setup.py",
line 18, in <module>
        from pgadmin.model import db, User, Version, ServerGroup, Server, \
    ModuleNotFoundError: No module named 'pgadmin'

Please let me know what you think. Happy to address any feedback.

Regards,
Azad Salahlı

diff --git a/web/setup.py b/web/setup.py
index 4cd090d15..fbc7f1e04 100644
--- a/web/setup.py
+++ b/web/setup.py
@@ -15,8 +15,6 @@ import json
 import os
 import sys
 import builtins
-from pgadmin.model import db, User, Version, ServerGroup, Server, \
-    SCHEMA_VERSION as CURRENT_SCHEMA_VERSION
 
 # Grab the SERVER_MODE if it's been set by the runtime
 if 'SERVER_MODE' in globals():
@@ -31,6 +29,8 @@ if sys.path[0] != root:
     sys.path.insert(0, root)
 
 from pgadmin import create_app
+from pgadmin.model import db, User, Version, ServerGroup, Server, \
+    SCHEMA_VERSION as CURRENT_SCHEMA_VERSION
 
 
 def add_value(attr_dict, key, value):


Attachments:

  [text/plain] import_fix.diff (652B, 2-import_fix.diff)
  download | inline diff:
diff --git a/web/setup.py b/web/setup.py
index 4cd090d15..fbc7f1e04 100644
--- a/web/setup.py
+++ b/web/setup.py
@@ -15,8 +15,6 @@ import json
 import os
 import sys
 import builtins
-from pgadmin.model import db, User, Version, ServerGroup, Server, \
-    SCHEMA_VERSION as CURRENT_SCHEMA_VERSION
 
 # Grab the SERVER_MODE if it's been set by the runtime
 if 'SERVER_MODE' in globals():
@@ -31,6 +29,8 @@ if sys.path[0] != root:
     sys.path.insert(0, root)
 
 from pgadmin import create_app
+from pgadmin.model import db, User, Version, ServerGroup, Server, \
+    SCHEMA_VERSION as CURRENT_SCHEMA_VERSION
 
 
 def add_value(attr_dict, key, value):

view thread (3+ messages)  latest in thread

reply

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Reply to all the recipients using the --to and --cc options:
  reply via email

  To: [email protected]
  Cc: [email protected]
  Subject: Re: [pgAdmin] Fix incorrect import in setup.py
  In-Reply-To: <CA+xqhcXzr-iSA5SDsKN5MbgC6i+AM-hRb5Pt+QjSaS20cRgEZg@mail.gmail.com>

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

This inbox is served by agora; see mirroring instructions
for how to clone and mirror all data and code used for this inbox