Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 33 additions & 0 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: Upload Python Package

on:
push:
tags:
- v**
workflow_dispatch:

jobs:
pypi-publish:
name: upload release to PyPI
runs-on: ubuntu-latest
# Specifying a GitHub environment is optional, but strongly encouraged
# environment: pypi
permissions:
# IMPORTANT: this permission is mandatory for Trusted Publishing
id-token: write
steps:
# retrieve your distributions here
- uses: actions/checkout@v3
- name: Set up Python
uses: actions/setup-python@v3
with:
python-version: '3.x'
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install build
- name: Build package
run: python -m build
- name: Publish package distributions to PyPI
uses: pypa/gh-action-pypi-publish@release/v1

2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ downloads
src_eggs
develop-eggs
.installed.cfg
django_xmlrpc.egg-info/
django_xmlrpc_dx.egg-info/
4 changes: 2 additions & 2 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
include README.rst
recursive-include django_xmlrpc/locale *
recursive-include django_xmlrpc/templates *.html
recursive-include django_xmlrpc_dx/locale *
recursive-include django_xmlrpc_dx/templates *.html
22 changes: 22 additions & 0 deletions README.rst
Original file line number Diff line number Diff line change
@@ -1,3 +1,25 @@
=========
ATTENTION
=========

This Repository is a fork of @Fantomas42 's legendary Django-XMLRPC package.
It fixes compatibility issues with current versions of Python and Django
that have unfortunately not been addressed in the upstream repo.

Installation
============

From PyPi:

$ pip install django-xmlrpc-dx

From source:

$ python setup.py install

Below is the intact README from the upstream. Some information may no
longer be accurate.

==============
Django XML-RPC
==============
Expand Down
6 changes: 3 additions & 3 deletions django_xmlrpc/__init__.py → django_xmlrpc_dx/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
"""__init__ module for the django_xmlrpc package
"""__init__ module for the django_xmlrpc_dx package

Authors::
Graham Binns
Expand Down Expand Up @@ -38,7 +38,7 @@
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
"""
VERSION = (0, 1, 8)
VERSION = (0, 1, 9)
__version__ = '.'.join(map(str, VERSION))

default_app_config = 'django_xmlrpc.apps.XMLRPCConfig'
default_app_config = 'django_xmlrpc_dx.apps.XMLRPCConfig'
6 changes: 3 additions & 3 deletions django_xmlrpc/apps.py → django_xmlrpc_dx/apps.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
"""apps module for the django_xmlrpc package
"""apps module for the django_xmlrpc_dx package

Authors::
Julien Fache
Expand Down Expand Up @@ -41,10 +41,10 @@


class XMLRPCConfig(AppConfig):
name = 'django_xmlrpc'
name = 'django_xmlrpc_dx'
label = 'xmlrpc'
verbose_name = 'XMRPC'

def ready(self):
from django_xmlrpc.registry import register_xmlrpc_methods
from django_xmlrpc_dx.registry import register_xmlrpc_methods
register_xmlrpc_methods()
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
"""Offers decorators to make the use of django_xmlrpc a great deal simpler
"""Offers decorators to make the use of django_xmlrpc_dx a great deal simpler

Authors::
Graham Binns,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
"""Offers a simple XML-RPC dispatcher for django_xmlrpc
"""Offers a simple XML-RPC dispatcher for django_xmlrpc_dx

Author::
Graham Binns
Expand Down Expand Up @@ -37,7 +37,10 @@
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
"""
from inspect import getargspec
try:
from inspect import getargspec
except ImportError: # Python 3.11+
from inspect import getfullargspec

try:
from xmlrpc.server import SimpleXMLRPCDispatcher
Expand Down
9 changes: 6 additions & 3 deletions django_xmlrpc/registry.py → django_xmlrpc_dx/registry.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
"""registry module for the django_xmlrpc package
"""registry module for the django_xmlrpc_dx package

Authors::
Julien Fache
Expand Down Expand Up @@ -37,14 +37,17 @@
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
"""
from collections import Callable
try:
from collections import Callable
except ImportError:
from collections.abc import Callable
from logging import getLogger

from django.apps import apps
from django.conf import settings
from django.core.exceptions import ImproperlyConfigured

from django_xmlrpc.dispatcher import xmlrpc_dispatcher
from django_xmlrpc_dx.dispatcher import xmlrpc_dispatcher

logger = getLogger('xmlrpc.registry')

Expand Down
2 changes: 1 addition & 1 deletion django_xmlrpc/views.py → django_xmlrpc_dx/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
from django.shortcuts import render
from django.views.decorators.csrf import csrf_exempt

from django_xmlrpc.dispatcher import xmlrpc_dispatcher
from django_xmlrpc_dx.dispatcher import xmlrpc_dispatcher


logger = getLogger('xmlrpc.views')
Expand Down
16 changes: 8 additions & 8 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,21 @@
from setuptools import find_packages
from setuptools import setup

import django_xmlrpc
import django_xmlrpc_dx


setup(name='django-xmlrpc',
version=django_xmlrpc.__version__,
setup(name='django-xmlrpc-dx',
version=django_xmlrpc_dx.__version__,

description='XML-RPC Server App for the Django framework.',
long_description=open(os.path.join('README.rst')).read(),
keywords='django, service, xmlrpc',

author='Graham Binns',
author_email='graham.binns@gmail.com',
maintainer='Fantomas42',
maintainer_email='fantomas42@gmail.com',
url='https://github.com/Fantomas42/django-xmlrpc',
author='rubeon',
author_email='rubeon@gmail.com',
maintainer='rubeon',
maintainer_email='rubeon@gmail.com',
url='https://github.com/rubeon/django-xmlrpc',

packages=find_packages(),
classifiers=[
Expand Down